From 6d1918581bc100ee996dcf0692a31887369e704d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 15 Dec 2017 09:50:43 -0500 Subject: [PATCH] build-sys: Bump glib dependency This matches reality; I picked what's in CentOS 7 mainline today. More importantly this also fixes a build error with `-Werror=undef` because we had a trailing underscore `_` at the end and never noticed. Closes: #1156 Approved by: jlebon --- Makefile.am | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d2baface..b73007d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DRPM_OSTREE_FEATURES='"$(RPM_OSTREE_FEATURES)"' \ -DRPM_OSTREE_GITREV='"$(RPM_OSTREE_GITREV)"' \ - -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40_ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_50 AM_CFLAGS += -std=gnu11 $(WARN_CFLAGS) # bundled libdnf AM_LDFLAGS += "-Wl,-rpath=$(libdir)/rpm-ostree" diff --git a/configure.ac b/configure.ac index dd3d66ae..0a3f2bf2 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ LIBS="$save_LIBS" # Remember to update AM_CPPFLAGS in Makefile.am when bumping GIO req. PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0]) -PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 >= 2.40.0 json-glib-1.0 +PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [gio-unix-2.0 >= 2.50.0 json-glib-1.0 ostree-1 >= 2017.14 libsystemd polkit-gobject-1