[gimp/wip/Jehan/meson-windows-official: 4/5] configure, meson: the build tool depends on very old glib.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/Jehan/meson-windows-official: 4/5] configure, meson: the build tool depends on very old glib.
- Date: Fri, 1 Apr 2022 16:12:35 +0000 (UTC)
commit b83450f9e26a819fef98e38d986d651a653fc79e
Author: Jehan <jehan girinstud io>
Date: Fri Apr 1 15:41:17 2022 +0200
configure, meson: the build tool depends on very old glib.
For the build tool, we really don't need a recent GLib. Checking the few
function docs, GLib 2.2 is fine, which (looking at git logs) means any
version after 2002. At this point, it's nearly unneeded to add a minimum
required version, but let's be thorough.
Anyway really no need to block a build if we have an old build GLib,
which is completely enough, as long we have the recent host GLib.
configure.ac | 11 +++++++----
meson.build | 3 ++-
2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f17b290ed1..a8820b5c14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,9 @@ m4_define([wmf_required_version], [0.2.8])
# version of gettext with more version numbers, please update the tests.
m4_define([xgettext_required_version], [0.19])
+# required versions for build-time only tools
+m4_define([native_glib_required_version], [2.2.0])
+
AC_INIT([GIMP], [gimp_version],
[https://gitlab.gnome.org/GNOME/gimp/issues/new],
[gimp])
@@ -2571,7 +2574,7 @@ if test "x$enable_vector_icons" != "xno"; then
test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.so"; then
# We must not use $PKG_CONFIG nor PKG_CHECK_* macros because we need
# to make sure we use the native pkg-config (in case we cross-compile).
- if pkg-config --atleast-version=glib_required_version glib-2.0 &&
+ if pkg-config --atleast-version=native_glib_required_version glib-2.0 &&
pkg-config gio-2.0; then
NATIVE_GLIB_LIBS=`pkg-config --libs gio-2.0 glib-2.0`
NATIVE_GLIB_CFLAGS=`pkg-config --cflags gio-2.0 glib-2.0`
@@ -2585,7 +2588,7 @@ WARNING: You enabled vector icons on Win32. Make sure to run:
so that GdkPixbuf knows where to find the SVG loader."
fi
else
- enable_vector_icons="no (missing native glib-2.0 > glib_required_version or gio-2.0)"
+ enable_vector_icons="no (missing native glib-2.0 > native_glib_required_version or gio-2.0)"
fi
else
enable_vector_icons="no (librsvg GdkPixbuf loader missing)"
@@ -2615,7 +2618,7 @@ WARNING: vector icons are disabled. Be aware that librsvg is still
fi
fi
-if pkg-config --atleast-version=glib_required_version glib-2.0 &&
+if pkg-config --atleast-version=native_glib_required_version glib-2.0 &&
pkg-config gio-2.0; then
NATIVE_GLIB_LIBS=`pkg-config --libs gio-2.0 glib-2.0 gmodule-2.0`
NATIVE_GLIB_CFLAGS=`pkg-config --cflags gio-2.0 glib-2.0 gmodule-2.0`
@@ -2628,7 +2631,7 @@ if pkg-config --atleast-version=glib_required_version glib-2.0 &&
add_deps_error([native librsvg-2.0], [Could not find librsvg for the build system.])
fi
else
- add_deps_error([native glib], [Could not find GLib for the build system.])
+ add_deps_error([native glib], [Could not find native GLib for the build system.])
fi
AC_SUBST(NATIVE_GLIB_LIBS)
diff --git a/meson.build b/meson.build
index cfa9e368bd..54d1175019 100644
--- a/meson.build
+++ b/meson.build
@@ -1064,7 +1064,8 @@ else
warnings += vec_warning
endif
-native_glib = dependency('glib-2.0', version: '>='+glib_minver, native: true)
+native_glib_minver = '2.2.0'
+native_glib = dependency('glib-2.0', version: '>='+native_glib_minver, native: true)
native_rsvg = dependency('librsvg-2.0', version: '>='+rsvg_minver, native: true)
# Running tests headless
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]