Thanks, applied as 935f837c9000d2680a81f02b976075f83393d5dc. Michael
[sent from post-receive hook] On Mon, 03 Aug 2020 08:30:01 +0200, Robert Schwebel <[email protected]> wrote: > The libmount option has changed from boolean to feature, so we need to > provide enabled/disabled to meson. > > Signed-off-by: Robert Schwebel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/glib.make b/rules/glib.make > index f6e68a6928e2..fb8b25bd85e5 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 443d6577a76e..49220bbc9265 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 \ _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
