summaryrefslogtreecommitdiff
path: root/package/libart
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-17 21:55:49 +0100
commit15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch)
tree727d3fd768a1abe75521190b90833b3a68cce4c6 /package/libart
parent0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff)
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking, but this is required to successfully link libraries or executables with SSP - pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/libart')
-rw-r--r--package/libart/patches/100-cross_compile_fix.patch6
-rw-r--r--package/libart/patches/patch-ltmain_sh11
2 files changed, 14 insertions, 3 deletions
diff --git a/package/libart/patches/100-cross_compile_fix.patch b/package/libart/patches/100-cross_compile_fix.patch
index aae1acccf..90cfda45f 100644
--- a/package/libart/patches/100-cross_compile_fix.patch
+++ b/package/libart/patches/100-cross_compile_fix.patch
@@ -1,7 +1,7 @@
diff -urN libart.old/Makefile.in libart.dev/Makefile.in
---- libart.old/Makefile.in 2005-01-21 10:52:11.000000000 +0100
-+++ libart.dev/Makefile.in 2005-07-17 19:31:05.000000000 +0200
-@@ -440,9 +440,9 @@
+--- libart_lgpl-2.3.17.orig/Makefile.in 2005-01-21 10:52:11.000000000 +0100
++++ libart_lgpl-2.3.17/Makefile.in 2011-01-15 22:35:19.000000000 +0100
+@@ -440,9 +440,9 @@ testuta$(EXEEXT): $(testuta_OBJECTS) $(t
@rm -f testuta$(EXEEXT)
$(LINK) $(testuta_LDFLAGS) $(testuta_OBJECTS) $(testuta_LDADD) $(LIBS)
diff --git a/package/libart/patches/patch-ltmain_sh b/package/libart/patches/patch-ltmain_sh
new file mode 100644
index 000000000..673d4f7ca
--- /dev/null
+++ b/package/libart/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- libart_lgpl-2.3.17.orig/ltmain.sh 2004-07-06 05:30:16.000000000 +0200
++++ libart_lgpl-2.3.17/ltmain.sh 2011-01-15 22:36:41.000000000 +0100
+@@ -1385,7 +1385,7 @@ EOF
+ # but this is not reliable with gcc because gcc may use -mfoo to
+ # select a different linker, different libraries, etc, while
+ # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ -m*|-fstack-protector*|-flto)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`