From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: [ptxdist] [PATCH 2/2] libxslt: version bump 1.1.29 -> 1.1.34
Date: Mon, 17 May 2021 18:04:47 +0200 [thread overview]
Message-ID: <20210517160447.95609-3-ada@thorsis.com> (raw)
In-Reply-To: <20210517160447.95609-1-ada@thorsis.com>
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 <ada@thorsis.com>
---
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 <wellnhofer@aevum.de>
+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 <mkl@pengutronix.de>
---
- 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
next prev parent reply other threads:[~2021-05-17 16:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 16:04 [ptxdist] [PATCH 0/2] libxml2/libxslt version bumps Alexander Dahl
2021-05-17 16:04 ` [ptxdist] [PATCH 1/2] libxml2: version bump 2.9.10 -> 2.9.12 Alexander Dahl
2021-05-27 6:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-05-17 16:04 ` Alexander Dahl [this message]
2021-05-27 6:45 ` [ptxdist] [APPLIED] libxslt: version bump 1.1.29 -> 1.1.34 Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210517160447.95609-3-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox