summaryrefslogtreecommitdiff
path: root/textproc/libxml2/patches
diff options
context:
space:
mode:
authorsno <sno@pkgsrc.org>2009-11-22 14:05:26 +0000
committersno <sno@pkgsrc.org>2009-11-22 14:05:26 +0000
commitf630dec9f4419c026c5aab06843bc7704a2061d3 (patch)
tree89a1290cd446738258ff148dace257641d64a0de /textproc/libxml2/patches
parent54323751e2df8922f6728a48a8ea0191828ba857 (diff)
downloadpkgsrc-f630dec9f4419c026c5aab06843bc7704a2061d3.tar.gz
Patches out invalid linker flags for solaris. Tested with OpenSolaris/amd64
and Solaris 10/sparc - both with Sun Studio C/C++ 12u1. Fixes PR pkg/42335 (thanks to Todd Kover for the hint).
Diffstat (limited to 'textproc/libxml2/patches')
-rw-r--r--textproc/libxml2/patches/patch-ab14
-rw-r--r--textproc/libxml2/patches/patch-ai13
2 files changed, 20 insertions, 7 deletions
diff --git a/textproc/libxml2/patches/patch-ab b/textproc/libxml2/patches/patch-ab
index 72038528099..658e280383b 100644
--- a/textproc/libxml2/patches/patch-ab
+++ b/textproc/libxml2/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.16 2009/10/21 14:55:32 drochner Exp $
+$NetBSD: patch-ab,v 1.17 2009/11/22 14:05:26 sno Exp $
---- configure.orig 2009-10-06 18:31:12.000000000 +0200
-+++ configure
-@@ -12149,7 +12149,7 @@ CC="$lt_save_CC"
+--- configure.orig Tue Oct 6 18:31:12 2009
++++ configure Mon Nov 16 17:18:20 2009
+@@ -12149,8 +12149,6 @@
VERSION_SCRIPT_FLAGS=
$(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
VERSION_SCRIPT_FLAGS=-Wl,--version-script=
-test "`uname`" == "SunOS" && \
-+test "`uname`" = "SunOS" && \
- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
if test -n "$VERSION_SCRIPT_FLAGS"; then
-@@ -19725,7 +19725,7 @@ fi
+ USE_VERSION_SCRIPT_TRUE=
+@@ -19725,7 +19723,7 @@
fi
diff --git a/textproc/libxml2/patches/patch-ai b/textproc/libxml2/patches/patch-ai
new file mode 100644
index 00000000000..af4ab12113a
--- /dev/null
+++ b/textproc/libxml2/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2009/11/22 14:05:26 sno Exp $
+
+--- configure.in.orig Mon Nov 16 17:18:38 2009
++++ configure.in Mon Nov 16 17:20:27 2009
+@@ -74,8 +74,6 @@
+ VERSION_SCRIPT_FLAGS=
+ $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
+ VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+-test "`uname`" == "SunOS" && \
+- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+ AC_SUBST(VERSION_SCRIPT_FLAGS)
+ AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"])
+