From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20200725191307.2424653-1-r.schwebel@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1k2Tyz-0002Gf-V5@dude02.hi.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Mon, 03 Aug 2020 08:30:01 +0200
Subject: Re: [ptxdist] [APPLIED] glib: version bump 2.62.2 -> 2.64.4 (latest
 stable)
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>

Thanks, applied as 935f837c9000d2680a81f02b976075f83393d5dc.

Michael

[sent from post-receive hook]

On Mon, 03 Aug 2020 08:30:01 +0200, Robert Schwebel <r.schwebel@pengutronix.de> wrote:
> 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>
> 
> 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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de