From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 17 May 2021 18:06:04 +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 1lifkq-0004K0-M3 for lore@lore.pengutronix.de; Mon, 17 May 2021 18:06:04 +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 1lifkq-0000wK-B3; Mon, 17 May 2021 18:06:04 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lifkS-0000gu-Fk for ptxdist@pengutronix.de; Mon, 17 May 2021 18:05:41 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id BC97BDB1 for ; Mon, 17 May 2021 18:05:39 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x3BoofS9r4_B for ; Mon, 17 May 2021 18:05:39 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id 966C41CB9; Mon, 17 May 2021 18:05:39 +0200 (CEST) From: Alexander Dahl To: ptxdist@pengutronix.de Date: Mon, 17 May 2021 18:04:47 +0200 Message-Id: <20210517160447.95609-3-ada@thorsis.com> In-Reply-To: <20210517160447.95609-1-ada@thorsis.com> References: <20210517160447.95609-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 2/2] 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 MIME-Version: 1.0 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 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 --- patches/libxslt-1.1.29/series | 4 ---- ...ml2-config-check-in-configure-script.patch | 23 +++++++++++++++++++ ...200-xslt-config-add-SYSROOT-support.patch} | 4 ++-- patches/libxslt-1.1.34/autogen.sh | 1 + patches/libxslt-1.1.34/series | 7 ++++++ rules/libxslt.make | 10 ++++---- 6 files changed, 39 insertions(+), 10 deletions(-) delete mode 100644 patches/libxslt-1.1.29/series create mode 100644 patches/libxslt-1.1.34/0001-Fix-xml2-config-check-in-configure-script.patch rename patches/{libxslt-1.1.29/0001-xslt-config-add-SYSROOT-support.patch => libxslt-1.1.34/0200-xslt-config-add-SYSROOT-support.patch} (87%) create mode 120000 patches/libxslt-1.1.34/autogen.sh create mode 100644 patches/libxslt-1.1.34/series diff --git a/patches/libxslt-1.1.29/series b/patches/libxslt-1.1.29/series deleted file mode 100644 index 04dc8b07e..000000000 --- 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 000000000..ab7227344 --- /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 dacc3eeb3..1f124a8d6 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 000000000..9f8a4cb7d --- /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 000000000..1ede19a8c --- /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 74aef587a..0ea879ead 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 -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de