summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-09-28 17:07:12 +0200
committerVladimir Glazunov <vg@openoffice.org>2010-09-28 17:07:12 +0200
commit6bb822163761a8fa442017c9bb6db238187e87bb (patch)
treef2842b2b40844e43b1f6e037fe2f8c46ccb07110
parent174354d508270ec7fad2c0b6a08db6f473073f88 (diff)
parentc7770bd2041aeca1831770c655c02ba26326e9a1 (diff)
CWS-TOOLING: integrate CWS sb126
-rw-r--r--cppunit/ldflags.patch13
-rw-r--r--libxmlsec/makefile.mk4
-rw-r--r--openssl/openssllnx.patch11
-rw-r--r--redland/raptor/makefile.mk2
-rw-r--r--redland/rasqal/makefile.mk2
-rw-r--r--redland/redland/makefile.mk2
6 files changed, 21 insertions, 13 deletions
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch
index cecd69a4b5ee..ee8d5ed897ce 100644
--- a/cppunit/ldflags.patch
+++ b/cppunit/ldflags.patch
@@ -1,10 +1,11 @@
---- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008
-+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010
-@@ -63,5 +63,6 @@
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.in 2008-02-20 06:59:55.000000000 +0100
++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in 2010-06-21 17:01:38.324370072 +0200
+@@ -300,7 +300,7 @@
- libcppunit_la_LDFLAGS= \
+ libcppunit_la_LDFLAGS = \
-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) \
-+ @LIBADD_DL@
++ -release $(LT_RELEASE) $(LIBADD_DL)
+
+ all: all-am
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index af695034b9a7..f721db3148a4 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -145,10 +145,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 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/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 62d4f704d0e4..b67f6ef314ce 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 efe099c88049..66fca99d1600 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 3db7c0559d2e..20b1210dd2f9 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'