From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 27 May 2021 08:47:17 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lm9nZ-0002sY-Bj for lore@lore.pengutronix.de; Thu, 27 May 2021 08:47:17 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lm9nY-00013k-Sl; Thu, 27 May 2021 08:47:16 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lm9m9-0005w6-Q6; Thu, 27 May 2021 08:45:49 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lm9m9-0006VO-A3; Thu, 27 May 2021 08:45:49 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lm9m9-00Gxs1-9Q; Thu, 27 May 2021 08:45:49 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 27 May 2021 08:45:49 +0200 Message-Id: <20210527064549.4043320-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210517160447.95609-3-ada@thorsis.com> References: <20210517160447.95609-3-ada@thorsis.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] libxslt: version bump 1.1.29 -> 1.1.34 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 1940c3646f2ff915a6b9cd51973f7a4041e2c4b2. Michael [sent from post-receive hook] On Thu, 27 May 2021 08:45:49 +0200, Alexander Dahl wrote: > Build failed after libxml2 upgrade to 2.9.12, thus this version bump > including an upstream post 1.1.34 patch fixing the build failure. > > Signed-off-by: Alexander Dahl > Message-Id: <20210517160447.95609-3-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/libxslt-1.1.29/series b/patches/libxslt-1.1.29/series > deleted file mode 100644 > index 04dc8b07ed73..000000000000 > --- a/patches/libxslt-1.1.29/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-xslt-config-add-SYSROOT-support.patch > -# 646fc10f99566b9f24135a2ca6e26cbc - git-ptx-patches magic > diff --git a/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch > new file mode 100644 > index 000000000000..ab722734438a > --- /dev/null > +++ b/patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch > @@ -0,0 +1,23 @@ > +From: Nick Wellnhofer > +Date: Fri, 15 Nov 2019 11:53:11 +0100 > +Subject: [PATCH] Fix xml2-config check in configure script > + > +A 'print' option has never been supported. After a recent change to > +libxml2, invalid options cause xml2-config to fail. > +--- > + configure.ac | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/configure.ac b/configure.ac > +index 325a7bea0dcf..d6b5594ad477 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -546,7 +546,7 @@ dnl make sure xml2-config is executable, > + dnl test version and init our variables > + dnl > + > +-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1 > ++if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1 > + then > + AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) > + XMLVERS=`$XML_CONFIG --version` > diff --git a/patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch b/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch > similarity index 87% > rename from patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch > rename to patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch > index dacc3eeb3f8c..1f124a8d6b4b 100644 > --- a/patches/libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch > +++ b/patches/libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch > @@ -4,11 +4,11 @@ Subject: [PATCH] xslt-config: add SYSROOT support > > Signed-off-by: Marc Kleine-Budde > --- > - xslt-config.in | 2 +- > + xslt-config.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xslt-config.in b/xslt-config.in > -index 45c3e28f2f12..5c009c4f4ad2 100644 > +index 1d376b66d89a..4951187533bb 100644 > --- a/xslt-config.in > +++ b/xslt-config.in > @@ -1,6 +1,6 @@ > diff --git a/patches/libxslt-1.1.34/autogen.sh b/patches/libxslt-1.1.34/autogen.sh > new file mode 120000 > index 000000000000..9f8a4cb7ddcb > --- /dev/null > +++ b/patches/libxslt-1.1.34/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/patches/libxslt-1.1.34/series b/patches/libxslt-1.1.34/series > new file mode 100644 > index 000000000000..1ede19a8c3fb > --- /dev/null > +++ b/patches/libxslt-1.1.34/series > @@ -0,0 +1,7 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +#tag:upstream --start-number 1 > +0001-Fix-xml2-config-check-in-configure-script.patch > +#tag:ptx --start-number 200 > +0200-xslt-config-add-SYSROOT-support.patch > +# c8a532c629ee7654cb91733eefc0814b - git-ptx-patches magic > diff --git a/rules/libxslt.make b/rules/libxslt.make > index 74aef587a1e2..0ea879ead228 100644 > --- a/rules/libxslt.make > +++ b/rules/libxslt.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt > # > # Paths and names > # > -LIBXSLT_VERSION := 1.1.29 > -LIBXSLT_MD5 := a129d3c44c022de3b9dcf6d6f288d72e > +LIBXSLT_VERSION := 1.1.34 > +LIBXSLT_MD5 := db8765c8d076f1b6caafd9f2542a304a > LIBXSLT := libxslt-$(LIBXSLT_VERSION) > LIBXSLT_SUFFIX := tar.gz > LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX) > @@ -43,9 +43,11 @@ LIBXSLT_AUTOCONF := \ > --disable-static \ > --without-python \ > --$(call ptx/wwo, PTXCONF_LIBXSLT_CRYPTO)-crypto \ > - --$(call ptx/wwo, PTXCONF_LIBXSLT_PLUGINS)-plugins \ > --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debug \ > - --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debugger > + --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-mem-debug \ > + --$(call ptx/wwo, PTXCONF_LIBXSLT_DEBUG)-debugger \ > + --without-profiler \ > + --$(call ptx/wwo, PTXCONF_LIBXSLT_PLUGINS)-plugins > > # ---------------------------------------------------------------------------- > # Target-Install _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de