* [ptxdist] [PATCH] xmlstarlet: depend on zlib
@ 2019-03-01 13:31 Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 0/2] xmlstarlet: address zlib linking errors Roland Hieber
0 siblings, 1 reply; 4+ messages in thread
From: Roland Hieber @ 2019-03-01 13:31 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Tell PTXdist to build zlib before xmlstarlet, otherwise xmlstarlet can
fail in parallel builds:
making links in crypto/cmac...
[...]/arm-v7a-linux-gnueabihf/bin/ld: cannot find -lz
collect2: error: ld returned 1 exit status
Makefile:376: recipe for target xml failed
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/xmlstarlet.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/rules/xmlstarlet.in b/rules/xmlstarlet.in
index e7ad99ba7..c000c06e9 100644
--- a/rules/xmlstarlet.in
+++ b/rules/xmlstarlet.in
@@ -5,6 +5,7 @@ config XMLSTARLET
select LIBXML2
select LIBXML2_SAX1
select LIBXSLT
+ select ZLIB
prompt "xmlstarlet"
help
XMLStarlet is a set of command line utilities (tools) which
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v2 0/2] xmlstarlet: address zlib linking errors
2019-03-01 13:31 [ptxdist] [PATCH] xmlstarlet: depend on zlib Roland Hieber
@ 2019-03-03 18:32 ` Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 1/2] xmlstarlet: convert old patch series with git-ptx-patches Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 2/2] xmlstarlet: fix linking when libssl is built without zlib Roland Hieber
0 siblings, 2 replies; 4+ messages in thread
From: Roland Hieber @ 2019-03-03 18:32 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
v2:
discussion with mol turned out that xmlstarlet does not actually
depend on zlib for linking, but that the configure script tries to do
things the wrong way. Adapt the old configure.ac patch in the existing
xmlstarlet patch series instead of depending on zlib.
Roland Hieber (2):
xmlstarlet: convert old patch series with git-ptx-patches
xmlstarlet: fix linking when libssl is built without zlib
...bug-functions-only-if-libxml2-has-d.patch} | 29 ++++++-------
...tarlet-fix-semicolon-in-wrong-place.patch} | 18 ++++----
...ut-if-no-dtd-parsing-support-in-lib.patch} | 20 ++++-----
...gainst-shared-instead-of-static-lib.patch} | 43 +++++++++++--------
patches/xmlstarlet-1.0.1/series | 11 +++--
5 files changed, 62 insertions(+), 59 deletions(-)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-test-libxml-debug.diff => 0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch} (77%)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-missing-semicolon.diff => 0002-xmlstarlet-fix-semicolon-in-wrong-place.patch} (65%)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-test-validation.diff => 0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch} (57%)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-fix-linking.diff => 0004-xmlstarlet-link-against-shared-instead-of-static-lib.patch} (69%)
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v2 1/2] xmlstarlet: convert old patch series with git-ptx-patches
2019-03-03 18:32 ` [ptxdist] [PATCH v2 0/2] xmlstarlet: address zlib linking errors Roland Hieber
@ 2019-03-03 18:32 ` Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 2/2] xmlstarlet: fix linking when libssl is built without zlib Roland Hieber
1 sibling, 0 replies; 4+ messages in thread
From: Roland Hieber @ 2019-03-03 18:32 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
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>
---
...bug-functions-only-if-libxml2-has-d.patch} | 29 +++++++++----------
...tarlet-fix-semicolon-in-wrong-place.patch} | 18 +++++-------
...ut-if-no-dtd-parsing-support-in-lib.patch} | 20 ++++++-------
...diff => 0004-xmlstarlet-fix-linking.patch} | 11 +++----
patches/xmlstarlet-1.0.1/series | 11 ++++---
5 files changed, 44 insertions(+), 45 deletions(-)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-test-libxml-debug.diff => 0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch} (77%)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-missing-semicolon.diff => 0002-xmlstarlet-fix-semicolon-in-wrong-place.patch} (65%)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-test-validation.diff => 0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch} (57%)
rename patches/xmlstarlet-1.0.1/{xmlstarlet-1.0.1-fix-linking.diff => 0004-xmlstarlet-fix-linking.patch} (94%)
diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-libxml-debug.diff b/patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch
similarity index 77%
rename from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-libxml-debug.diff
rename to patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch
index d073f4f04..81c108f17 100644
--- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-libxml-debug.diff
+++ b/patches/xmlstarlet-1.0.1/0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch
@@ -1,5 +1,7 @@
-Subject: xmlstarlet: use debug functions only if libxml2 has debug support
From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 29 Nov 2009 00:00:00 +0100
+Subject: [PATCH] xmlstarlet: use debug functions only if libxml2 has debug
+ support
We use xmlXPathDebugDumpCompExpr without testing if libxml2 has support
for it enabled. This can result in the following linker error:
@@ -9,19 +11,16 @@ xmlstarlet-1.0.1/src/xml_edit.c:327:
undefined reference to `xmlXPathDebugDumpCompExpr'
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
+Applied-Upstream: 1.0.2, commit:1cb3f329c92ee9aa9e1dc15c1f1e46a9fc31d4b8
---
-#20091129: rsc: submitted to upstream:
-# https://sourceforge.net/tracker/?func=detail&aid=2905668&group_id=66612&atid=515108
-
- src/xml_edit.c | 18 ++++++++++++------
+ src/xml_edit.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
-Index: xmlstarlet-1.0.1/src/xml_edit.c
-===================================================================
---- xmlstarlet-1.0.1.orig/src/xml_edit.c
-+++ xmlstarlet-1.0.1/src/xml_edit.c
-@@ -323,9 +323,10 @@ edUpdate(xmlDocPtr doc, const char *loc,
+diff --git a/src/xml_edit.c b/src/xml_edit.c
+index 8e195304302a..42391a9bd569 100644
+--- a/src/xml_edit.c
++++ b/src/xml_edit.c
+@@ -323,9 +323,10 @@ edUpdate(xmlDocPtr doc, const char *loc, const char *val, XmlNodeType type)
comp = xmlXPathCompile(BAD_CAST loc);
if (comp != NULL)
{
@@ -33,7 +32,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c
res = xmlXPathCompiledEval(comp, ctxt);
xmlXPathFreeCompExpr(comp);
}
-@@ -406,9 +407,10 @@ edInsert(xmlDocPtr doc, const char *loc,
+@@ -406,9 +407,10 @@ edInsert(xmlDocPtr doc, const char *loc, const char *val, const char *name,
comp = xmlXPathCompile(BAD_CAST loc);
if (comp != NULL)
{
@@ -45,7 +44,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c
res = xmlXPathCompiledEval(comp, ctxt);
xmlXPathFreeCompExpr(comp);
}
-@@ -508,9 +510,10 @@ edRename(xmlDocPtr doc, char *loc, char
+@@ -508,9 +510,10 @@ edRename(xmlDocPtr doc, char *loc, char *val, XmlNodeType type)
comp = xmlXPathCompile(BAD_CAST loc);
if (comp != NULL)
{
@@ -69,7 +68,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c
res = xmlXPathCompiledEval(comp, ctxt);
xmlXPathFreeCompExpr(comp);
}
-@@ -691,9 +695,10 @@ edMove(xmlDocPtr doc, char *from, char *
+@@ -691,9 +695,10 @@ edMove(xmlDocPtr doc, char *from, char *to)
comp = xmlXPathCompile(BAD_CAST from);
if (comp != NULL)
{
@@ -81,7 +80,7 @@ Index: xmlstarlet-1.0.1/src/xml_edit.c
res = xmlXPathCompiledEval(comp, ctxt);
xmlXPathFreeCompExpr(comp);
}
-@@ -738,9 +743,10 @@ edMove(xmlDocPtr doc, char *from, char *
+@@ -738,9 +743,10 @@ edMove(xmlDocPtr doc, char *from, char *to)
comp = xmlXPathCompile(BAD_CAST to);
if (comp != NULL)
{
diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-missing-semicolon.diff b/patches/xmlstarlet-1.0.1/0002-xmlstarlet-fix-semicolon-in-wrong-place.patch
similarity index 65%
rename from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-missing-semicolon.diff
rename to patches/xmlstarlet-1.0.1/0002-xmlstarlet-fix-semicolon-in-wrong-place.patch
index 74702863e..ef72a286a 100644
--- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-missing-semicolon.diff
+++ b/patches/xmlstarlet-1.0.1/0002-xmlstarlet-fix-semicolon-in-wrong-place.patch
@@ -1,5 +1,6 @@
-Subject: xmlstarlet: fix semicolon in wrong place
From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 29 Nov 2009 00:00:00 +0100
+Subject: [PATCH] xmlstarlet: fix semicolon in wrong place
We define a semicolon in the wrong place:
@@ -9,18 +10,15 @@ This does not fail only by accident, if the right defines have been set
in libxml2.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
+Applied-Upstream: 1.0.2, commit:5cfe8480b3029311a3bcaf0471c023d5175fa58d
---
-#20091129: rsc: submitted to upstream:
-# https://sourceforge.net/tracker/?func=detail&aid=2905712&group_id=66612&atid=515108
-
- src/xml_trans.c | 3 ++-
+ src/xml_trans.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: xmlstarlet-1.0.1/src/xml_trans.c
-===================================================================
---- xmlstarlet-1.0.1.orig/src/xml_trans.c
-+++ xmlstarlet-1.0.1/src/xml_trans.c
+diff --git a/src/xml_trans.c b/src/xml_trans.c
+index 38ddcf84b5cd..c967f0b19762 100644
+--- a/src/xml_trans.c
++++ b/src/xml_trans.c
@@ -75,8 +75,9 @@ static const char trans_usage_str_3[] =
#ifdef LIBXML_CATALOG_ENABLED
" --catalogs - use SGML catalogs from $SGML_CATALOG_FILES\n"
diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-validation.diff b/patches/xmlstarlet-1.0.1/0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch
similarity index 57%
rename from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-validation.diff
rename to patches/xmlstarlet-1.0.1/0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch
index 1e5813f22..d61682c5e 100644
--- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-test-validation.diff
+++ b/patches/xmlstarlet-1.0.1/0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch
@@ -1,5 +1,6 @@
-Subject: xmlstarlet: bail out if no dtd parsing support in libxml2
From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Sun, 29 Nov 2009 00:00:00 +0100
+Subject: [PATCH] xmlstarlet: bail out if no dtd parsing support in libxml2
We use xmlParseDTD without testing if libxml2 has support
for it enabled. This can result in the following linker error:
@@ -9,19 +10,16 @@ xmlstarlet-1.0.1/src/xml_validate.c:229:
undefined reference to `xmlParseDTD'
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
+Applied-Upstream: 1.0.2, commit:5f2a71f57c1500b98ee2d1f9f6757854349e0072
---
-#20091129: rsc: submitted to upstream:
-# https://sourceforge.net/tracker/?func=detail&aid=2905714&group_id=66612&atid=515108
-
- src/xml_validate.c | 5 +++++
+ src/xml_validate.c | 5 +++++
1 file changed, 5 insertions(+)
-Index: xmlstarlet-1.0.1/src/xml_validate.c
-===================================================================
---- xmlstarlet-1.0.1.orig/src/xml_validate.c
-+++ xmlstarlet-1.0.1/src/xml_validate.c
-@@ -226,6 +226,11 @@ valAgainstDtd(valOptionsPtr ops, char* d
+diff --git a/src/xml_validate.c b/src/xml_validate.c
+index 911bb16d1d5f..a7f55b8da864 100644
+--- a/src/xml_validate.c
++++ b/src/xml_validate.c
+@@ -226,6 +226,11 @@ valAgainstDtd(valOptionsPtr ops, char* dtdvalid, xmlDocPtr doc, char* filename)
{
xmlDtdPtr dtd;
diff --git a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-fix-linking.diff b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
similarity index 94%
rename from patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-fix-linking.diff
rename to patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
index b8e89a0fc..90aa47567 100644
--- a/patches/xmlstarlet-1.0.1/xmlstarlet-1.0.1-fix-linking.diff
+++ b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
@@ -1,5 +1,6 @@
-Subject: xmlstarlet: fix linking
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.
@@ -11,13 +12,13 @@ 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 ++++++++--------
+ configure.in | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
-Index: b/configure.in
-===================================================================
+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,
diff --git a/patches/xmlstarlet-1.0.1/series b/patches/xmlstarlet-1.0.1/series
index 7e4590629..c6360809b 100644
--- a/patches/xmlstarlet-1.0.1/series
+++ b/patches/xmlstarlet-1.0.1/series
@@ -1,4 +1,7 @@
-xmlstarlet-1.0.1-test-libxml-debug.diff
-xmlstarlet-1.0.1-missing-semicolon.diff
-xmlstarlet-1.0.1-test-validation.diff
-xmlstarlet-1.0.1-fix-linking.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch
+0002-xmlstarlet-fix-semicolon-in-wrong-place.patch
+0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch
+0004-xmlstarlet-fix-linking.patch
+# 5ce4c70ec2f7f73bf4105b9adcc9682e - git-ptx-patches magic
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v2 2/2] xmlstarlet: fix linking when libssl is built without zlib
2019-03-03 18:32 ` [ptxdist] [PATCH v2 0/2] xmlstarlet: address zlib linking errors Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 1/2] xmlstarlet: convert old patch series with git-ptx-patches Roland Hieber
@ 2019-03-03 18:32 ` Roland Hieber
1 sibling, 0 replies; 4+ messages in thread
From: Roland Hieber @ 2019-03-03 18:32 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Adapt the already existing patch and its description to prevent a
[...]/arm-v7a-linux-gnueabihf/bin/ld: cannot find -lz
error message when building openssl without zlib support.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
...gainst-shared-instead-of-static-lib.patch} | 38 ++++++++++---------
patches/xmlstarlet-1.0.1/series | 4 +-
2 files changed, 23 insertions(+), 19 deletions(-)
rename patches/xmlstarlet-1.0.1/{0004-xmlstarlet-fix-linking.patch => 0004-xmlstarlet-link-against-shared-instead-of-static-lib.patch} (72%)
diff --git a/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-link-against-shared-instead-of-static-lib.patch
similarity index 72%
rename from patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
rename to patches/xmlstarlet-1.0.1/0004-xmlstarlet-link-against-shared-instead-of-static-lib.patch
index 90aa47567..fb77ecd6d 100644
--- a/patches/xmlstarlet-1.0.1/0004-xmlstarlet-fix-linking.patch
+++ b/patches/xmlstarlet-1.0.1/0004-xmlstarlet-link-against-shared-instead-of-static-lib.patch
@@ -1,24 +1,28 @@
From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 11 Jan 2010 16:03:22 +0100
-Subject: [PATCH] xmlstarlet: fix linking
+Date: Fri, 1 Mar 2019 15:11:36 +0100
+Subject: [PATCH] xmlstarlet: link against shared instead of static libs
-xmlstarlet links libexslt statically. The configure script does not check for
-the dependencies. This fails if libexslt links agains libgcrypt.
+xmlstarlet links against libxml2 and libexslt statically. The configure
+script does not check for the dependencies. This fails if libexslt links
+agains libgcrypt or if libxml2 does _not_ link against zlib (then zlib
+may not be available at all).
-This patch changes the configure script, so that all libs are linked
-dynamically. The linker does the rest.
+This patch changes the configure script so that all libs are linked
+dynamically. The linker can infer their respective dependencies from the
+ELF header in the .so files.
-For ptxdist this is ok. We install the libs already.
-Not for upstream.
+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
+[rhi: also remove now unneeded -l flags and adapt patch description]
+Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configure.in | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure.in b/configure.in
-index 856a451cac7f..713d2b34dd32 100644
+index 856a451cac7f..e1c99ba07c81 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ AC_ARG_WITH(libxml-prefix,
@@ -26,7 +30,7 @@ index 856a451cac7f..713d2b34dd32 100644
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"
++ LIBXML_LIBS="$withval/lib/libxml2.so"
)
AC_ARG_WITH(libxml-include-prefix,
@@ -35,14 +39,14 @@ index 856a451cac7f..713d2b34dd32 100644
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"
++ LIBXML_LIBS="$withval/libxml2.so"
)
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_LIBS="$withval/.libs/libxml2.so"
LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml -I$withval/include"
)
@@ -51,7 +55,7 @@ index 856a451cac7f..713d2b34dd32 100644
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"
++ LIBXSLT_LIBS="$withval/lib/libxslt.so $withval/lib/libexslt.so"
)
AC_ARG_WITH(libxslt-include-prefix,
@@ -60,14 +64,14 @@ index 856a451cac7f..713d2b34dd32 100644
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"
++ LIBXSLT_LIBS="$withval/libxslt.so $withval/libexslt.so"
)
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_LIBS="$withval/libxslt/.libs/libxslt.so $withval/libexslt/.libs/libexslt.so"
LIBXSLT_CFLAGS="-I$withval/libxslt -I$withval/libexslt -I$withval"
)
@@ -76,7 +80,7 @@ index 856a451cac7f..713d2b34dd32 100644
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"
++ LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.so"
fi
dnl
@@ -85,7 +89,7 @@ index 856a451cac7f..713d2b34dd32 100644
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"
++ LIBXSLT_LIBS="${LIBXSLT_PREFIX}/lib/libxslt.so ${LIBXSLT_PREFIX}/lib/libexslt.so"
fi
dnl
diff --git a/patches/xmlstarlet-1.0.1/series b/patches/xmlstarlet-1.0.1/series
index c6360809b..c6606cb04 100644
--- a/patches/xmlstarlet-1.0.1/series
+++ b/patches/xmlstarlet-1.0.1/series
@@ -3,5 +3,5 @@
0001-xmlstarlet-use-debug-functions-only-if-libxml2-has-d.patch
0002-xmlstarlet-fix-semicolon-in-wrong-place.patch
0003-xmlstarlet-bail-out-if-no-dtd-parsing-support-in-lib.patch
-0004-xmlstarlet-fix-linking.patch
-# 5ce4c70ec2f7f73bf4105b9adcc9682e - git-ptx-patches magic
+0004-xmlstarlet-link-against-shared-instead-of-static-lib.patch
+# 338410071307078bc0758338bee4bf1c - git-ptx-patches magic
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-03-03 18:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-01 13:31 [ptxdist] [PATCH] xmlstarlet: depend on zlib Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 0/2] xmlstarlet: address zlib linking errors Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 1/2] xmlstarlet: convert old patch series with git-ptx-patches Roland Hieber
2019-03-03 18:32 ` [ptxdist] [PATCH v2 2/2] xmlstarlet: fix linking when libssl is built without zlib Roland Hieber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox