summaryrefslogtreecommitdiffstats
path: root/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
diff options
context:
space:
mode:
authorRoland Hieber <rhi@pengutronix.de>2019-03-03 19:32:35 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-03-04 12:47:02 +0100
commitca43b5ea940478e0d7a37cebff98f8ef23f3ea7b (patch)
tree6f6f1ff33bfc288f513a8c87065c56c17f08bd3a /patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
parentc6c7a1588b9195d33d4802af18187f9c754c6f95 (diff)
downloadptxdist-ca43b5ea940478e0d7a37cebff98f8ef23f3ea7b.tar.gz
ptxdist-ca43b5ea940478e0d7a37cebff98f8ef23f3ea7b.tar.xz
xmlstarlet: convert old patch series with git-ptx-patches
When using git-ptx-patches, it adds additional headers inserted by default by git-format-patch. Get rid of this diff for future changes in the patch series while still staying compatible with the quilt instead of git-ptx-patches workflow. The date headers were reverse-engineered from Git history, the Applied-Upstream tags were added based on the patch tracking information of the patches. No functional changes. Signed-off-by: Roland Hieber <rhi@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch')
-rw-r--r--patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch91
1 files changed, 91 insertions, 0 deletions
diff --git a/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
new file mode 100644
index 000000000..90aa47567
--- /dev/null
+++ b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
@@ -0,0 +1,91 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 11 Jan 2010 16:03:22 +0100
+Subject: [PATCH] xmlstarlet: fix linking
+
+xmlstarlet links libexslt statically. The configure script does not check for
+the dependencies. This fails if libexslt links agains libgcrypt.
+
+This patch changes the configure script, so that all libs are linked
+dynamically. The linker does the rest.
+
+For ptxdist this is ok. We install the libs already.
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+Forwarded: not-needed
+---
+ configure.in | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 856a451cac7f..713d2b34dd32 100644
+--- a/configure.in
++++ b/configure.in
+@@ -31,7 +31,7 @@ AC_ARG_WITH(libxml-prefix,
+ [ --with-libxml-prefix=[PFX] Specify location of libxml],
+ LIBXML_PREFIX=$withval
+ LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml"
+- LIBXML_LIBS="$withval/lib/libxml2.a -lz -lm -lpthread -ldl"
++ LIBXML_LIBS="$withval/lib/libxml2.so -lz -lm -lpthread -ldl"
+ )
+
+ AC_ARG_WITH(libxml-include-prefix,
+@@ -41,13 +41,13 @@ AC_ARG_WITH(libxml-include-prefix,
+
+ AC_ARG_WITH(libxml-libs-prefix,
+ [ --with-libxml-libs-prefix=[PFX] Specify location of libxml libs],
+- LIBXML_LIBS="$withval/libxml2.a -lz -lm -lpthread -ldl"
++ LIBXML_LIBS="$withval/libxml2.so -lz -lm -lpthread -ldl"
+ )
+
+ AC_ARG_WITH(libxml-src,
+ [ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)],
+ LIBXML_SRC="$withval"
+- LIBXML_LIBS="$withval/.libs/libxml2.a -lz -lm -lpthread"
++ LIBXML_LIBS="$withval/.libs/libxml2.so -lz -lm -lpthread"
+ LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml -I$withval/include"
+ )
+
+@@ -74,7 +74,7 @@ AC_ARG_WITH(libxslt-prefix,
+ [ --with-libxslt-prefix=[PFX] Specify location of libxslt],
+ LIBXSLT_PREFIX=$withval
+ LIBXSLT_CFLAGS="-I$withval/include/libxslt -I$withval/include/libexslt"
+- LIBXSLT_LIBS="$withval/lib/libxslt.a $withval/lib/libexslt.a -lz -lm -lpthread"
++ LIBXSLT_LIBS="$withval/lib/libxslt.so $withval/lib/libexslt.so -lz -lm -lpthread"
+ )
+
+ AC_ARG_WITH(libxslt-include-prefix,
+@@ -84,13 +84,13 @@ AC_ARG_WITH(libxslt-include-prefix,
+
+ AC_ARG_WITH(libxslt-libs-prefix,
+ [ --with-libxslt-libs-prefix=[PFX] Specify location of libxslt libs],
+- LIBXSLT_LIBS="$withval/libxslt.a $withval/libexslt.a -lz -lm -lpthread"
++ LIBXSLT_LIBS="$withval/libxslt.so $withval/libexslt.so -lz -lm -lpthread"
+ )
+
+ AC_ARG_WITH(libxslt-src,
+ [ --with-libxslt-src=[DIR] For libxslt thats not installed yet (sets all three above)],
+ LIBXSLT_SRC="$withval"
+- LIBXSLT_LIBS="$withval/libxslt/.libs/libxslt.a $withval/libexslt/.libs/libexslt.a -lz -lm -lpthread"
++ LIBXSLT_LIBS="$withval/libxslt/.libs/libxslt.so $withval/libexslt/.libs/libexslt.so -lz -lm -lpthread"
+ LIBXSLT_CFLAGS="-I$withval/libxslt -I$withval/libexslt -I$withval"
+ )
+
+@@ -236,7 +236,7 @@ dnl Set LIBXML libraries location
+ dnl
+ if test "x$LIBXML_LIBS" = "x"
+ then
+- LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.a -lz -lm -lpthread -ldl"
++ LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.so -lz -lm -lpthread -ldl"
+ fi
+
+ dnl
+@@ -252,7 +252,7 @@ dnl Set LIBXSLT libraries location
+ dnl
+ if test "x$LIBXSLT_LIBS" = "x"
+ then
+- LIBXSLT_LIBS="${LIBXSLT_PREFIX}/lib/libxslt.a ${LIBXSLT_PREFIX}/lib/libexslt.a -lz -lm -lpthread"
++ LIBXSLT_LIBS="${LIBXSLT_PREFIX}/lib/libxslt.so ${LIBXSLT_PREFIX}/lib/libexslt.so -lz -lm -lpthread"
+ fi
+
+ dnl