summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorsb <sb@openoffice.org>2010-06-22 09:31:32 +0200
committersb <sb@openoffice.org>2010-06-22 09:31:32 +0200
commit05c8709f2cda853e5bd99784147f1344d2a275cc (patch)
tree10b4306292bb1fac939b45e4422f760a0ddb71bb /openssl
parent65ad69352a30353b8800a2f70874806cf137c42b (diff)
sb126: #i110197# remove -Wl,-z,noexecstack hack
Diffstat (limited to 'openssl')
-rw-r--r--openssl/openssllnx.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 7f26b997bd1c..5d8f8231e45a 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -10,6 +10,17 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
+--- misc/openssl-0.9.8l/Makefile.org 2009-03-03 23:40:29.000000000 +0100
++++ misc/build/openssl-0.9.8l/Makefile.org 2010-06-21 11:11:03.787119295 +0200
+@@ -198,7 +198,7 @@
+
+ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
+ CC='${CC}' CFLAG='${CFLAG}' \
+- AS='${CC}' ASFLAG='${CFLAG} -c' \
++ AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
+ AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \
+ INSTALL_PREFIX='${INSTALL_PREFIX}' \
--- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
@@ -408,7 +408,7 @@