diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2020-07-25 21:12:59 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-07-30 12:10:35 +0200 |
| commit | 935f837c9000d2680a81f02b976075f83393d5dc (patch) | |
| tree | a6f73670cfac1f0588b4384419d9de067a8ef254 | |
| parent | 69b9062765aa71af6828e2db7a810bdd9571bd06 (diff) | |
| download | ptxdist-935f837c9000d2680a81f02b976075f83393d5dc.tar.gz ptxdist-935f837c9000d2680a81f02b976075f83393d5dc.tar.xz | |
glib: version bump 2.62.2 -> 2.64.4 (latest stable)
The libmount option has changed from boolean to feature, so we need to
provide enabled/disabled to meson.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Message-Id: <20200725191307.2424653-1-r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/glib.make | 6 | ||||
| -rw-r--r-- | rules/host-glib.make | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rules/glib.make b/rules/glib.make index f6e68a692..fb8b25bd8 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib # # Paths and names # -GLIB_VERSION := 2.62.2 -GLIB_MD5 := bed3a70397a019965efac0c49f9c8164 +GLIB_VERSION := 2.64.4 +GLIB_MD5 := 0a4f67e9a9d729976e2f797e36fc1a57 GLIB := glib-$(GLIB_VERSION) GLIB_SUFFIX := tar.xz GLIB_SOURCE := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX) @@ -44,7 +44,7 @@ GLIB_CONF_OPT := \ -Diconv=libc \ -Dinstalled_tests=false \ -Dinternal_pcre=false \ - -Dlibmount=$(call ptx/truefalse, PTXCONF_GLIB_LIBMOUNT) \ + -Dlibmount=$(call ptx/endis, PTXCONF_GLIB_LIBMOUNT)d \ -Dman=false \ -Dnls=disabled \ -Dselinux=disabled \ diff --git a/rules/host-glib.make b/rules/host-glib.make index 443d6577a..49220bbc9 100644 --- a/rules/host-glib.make +++ b/rules/host-glib.make @@ -34,7 +34,7 @@ HOST_GLIB_CONF_OPT := \ -Diconv=libc \ -Dinstalled_tests=false \ -Dinternal_pcre=false \ - -Dlibmount=false \ + -Dlibmount=disabled \ -Dman=false \ -Dnls=disabled \ -Dselinux=disabled \ |