diff options
| -rw-r--r-- | libxmlsec/makefile.mk | 4 | ||||
| -rw-r--r-- | openssl/openssllnx.patch | 11 | ||||
| -rw-r--r-- | redland/raptor/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 2 |
5 files changed, 14 insertions, 7 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 1f0e5976f5e5..2c25909320b9 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -143,10 +143,6 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" -.IF "$(OS)$(COM)"=="LINUXGCC" -xmlsec_LDFLAGS+=-Wl,-z,noexecstack -.ENDIF - LDFLAGS:=$(xmlsec_LDFLAGS) .EXPORT: LDFLAGS 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 @@ diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 1375ae878497..fb110e4fff37 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -93,7 +93,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index d48b7af39cb4..4cf766804819 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index d6acd4d8ea4d..02770cb7fbd1 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/librdf .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' |