colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: bump dependency to glib-2.42

Browse Source 
glib-2.42 brings G_PARAM_EXPLICIT_NOTIFY, which is interesting to use.

2.42.0 was released 2014-09-22, so it's very old. Bump from 2.40 to
2.42.0.
This commit is contained in:
Thomas Haller
2023-12-11 11:21:27 +01:00
parent 358c534e19
commit b749c01091
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -273,13 +273,11 @@ AC_SEARCH_LIBS([dlopen], [dl dld],
[test "$ac_cv_search_dlopen" = "none required" || AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen"]), [test "$ac_cv_search_dlopen" = "none required" || AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen"]),
[]) [])
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0], PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.42 gmodule-2.0])
[AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh')
AC_SUBST(AM_TESTS_FD_REDIRECT, '--tap')],
[PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.40 gmodule-2.0)
AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/test-driver')])
GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40" AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/test-driver')
GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42"
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)

6
meson.build
View File

@@ -274,7 +274,7 @@ config_h.set10('HAVE_LIBSYSTEMD', libsystemd_dep.found())
systemd_dep = dependency('systemd', required: false) systemd_dep = dependency('systemd', required: false)
gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.40') gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.42')
glib_dep = declare_dependency( glib_dep = declare_dependency(
dependencies: [ dependencies: [
@@ -282,8 +282,8 @@ glib_dep = declare_dependency(
dependency('gmodule-2.0'), dependency('gmodule-2.0'),
], ],
compile_args: [ compile_args: [
'-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40', '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42',
'-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42',
] ]
) )