mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-09 01:50:21 +01:00
build: target GLib 2.34 (bgo #687218)
By specifying GLIB_VERSION_MAX_ALLOWED=GLIB_2_34, we tell GLib not to warn us about e.g. g_type_init() being deprecated in 2.36. This avoids the NM build blowing up with the default -Werror configuration if we happen to have a newer GLib in the buildroot.
This commit is contained in:
parent
1977fb6c49
commit
ceba6bf4c5
1 changed files with 4 additions and 1 deletions
|
|
@ -221,12 +221,15 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.94)
|
|||
AC_SUBST(DBUS_CFLAGS)
|
||||
AC_SUBST(DBUS_LIBS)
|
||||
|
||||
GLIB_VERSION_DEFINES="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 '-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,34)'"
|
||||
|
||||
# dbus-glib uses GValueArray, which is deprecated as of GLib 2.32.
|
||||
# Set GLIB_VERSION_MIN_REQUIRED to something less than that to avoid
|
||||
# getting warnings. (GLIB_VERSION_2_26 is the oldest defined version.)
|
||||
DBUS_CFLAGS="$DBUS_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26"
|
||||
DBUS_CFLAGS="$DBUS_CFLAGS $GLIB_VERSION_DEFINES"
|
||||
|
||||
PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.22 gmodule-2.0)
|
||||
GLIB_CFLAGS="$GLIB_CFLAGS $GLIB_VERSION_DEFINES"
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue