diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
| commit | 89c4f8907fb3cf30b7e0a8837c01f525b8609d00 (patch) | |
| tree | e3151b3bd808b097c08e29519e59d0fe906950df /openssl | |
| parent | b54d64f2b8234f620b0f11fbc298dcb68119b408 (diff) | |
| parent | 890599fd2bd872aaa52a278febc7b72036ce0664 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
cppunit/ldflags.patch
hyphen/hyphen-2.4.patch
libegg/source/eggtrayicon.c
libtextcat/makefile.mk
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/openssllnx.patch | 11 | ||||
| -rwxr-xr-x | openssl/opensslmingw.patch | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index abd10061ff5c..449ebce2cae1 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/build/openssl-0.9.8o/Makefile.org 2010-01-27 17:06:36.000000000 +0100 ++++ misc/build/openssl-0.9.8o/Makefile.org 2010-09-20 09:24:00.000000000 +0100 +@@ -199,7 +199,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}/$(LIBDIR)' \ + INSTALL_PREFIX='${INSTALL_PREFIX}' \ --- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100 +++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200 @@ -399,27 +399,21 @@ diff --git a/openssl/opensslmingw.patch b/openssl/opensslmingw.patch index 10b48531190d..0ea8287b53eb 100755 --- a/openssl/opensslmingw.patch +++ b/openssl/opensslmingw.patch @@ -69,9 +69,9 @@ +goto finished + +:shared_gxxlib -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 -lstdc++_s ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lwsock32 -lgdi32 %MINGW_SHARED_LIBSTDSPP% +if errorlevel 1 goto end -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -lstdc++_s ++gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP% +if errorlevel 1 goto end +goto finished |