diff options
author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-11-09 15:15:30 +0100 |
---|---|---|
committer | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2010-11-09 15:15:30 +0100 |
commit | 42b752c1e6fdf81f21e1ea2015548236d902779f (patch) | |
tree | bf846c62d10f8bc722414462e440a0c477372bf0 | |
parent | b421e6568ae2b3f902ff55cb8dd4b000ef4ba0b0 (diff) | |
parent | e435401d645727a0b2164a3ea15f2b10028a7a2b (diff) |
dr77: rebase to DEV300m92
-rw-r--r-- | cppunit/ldflags.patch | 13 | ||||
-rw-r--r-- | libegg/source/makefile.mk | 3 | ||||
-rw-r--r-- | libxmlsec/makefile.mk | 4 | ||||
-rw-r--r-- | np_sdk/prj/build.lst | 2 | ||||
-rw-r--r-- | openssl/openssllnx.patch | 11 | ||||
-rw-r--r-- | redland/prj/d.lst | 1 | ||||
-rw-r--r-- | redland/raptor/makefile.mk | 2 | ||||
-rw-r--r-- | redland/rasqal/makefile.mk | 2 | ||||
-rw-r--r-- | redland/redland/makefile.mk | 2 |
9 files changed, 23 insertions, 17 deletions
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch index cecd69a..ee8d5ed 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/libegg/source/makefile.mk b/libegg/source/makefile.mk index 2603756..dbc326a 100644 --- a/libegg/source/makefile.mk +++ b/libegg/source/makefile.mk @@ -63,7 +63,4 @@ SHL1LIBS= $(SLB)$/eggtray.lib # --- Targets ---------------------------------- .ENDIF # L10N_framework -.IF "$(OS)$(CPU)" == "LINUXX" && "$(LIBRARY_PATH)" != "" -EXTRALIBPATHS+=-L$(LIBRARY_PATH) -.ENDIF # "$(OS)$(CPU)" == "LINUXX" .INCLUDE : target.mk diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 3dd3154..123a344 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/np_sdk/prj/build.lst b/np_sdk/prj/build.lst index 01dbd7b..7aa9a6d 100644 --- a/np_sdk/prj/build.lst +++ b/np_sdk/prj/build.lst @@ -1,3 +1,3 @@ -np np_sdk : soltools NULL +np np_sdk : soltools stlport NULL np np_sdk usr1 - all np_sdk NULL np np_sdk\mozsrc nmake - all np_mozsrc NULL diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch index abd1006..449ebce 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/prj/d.lst b/redland/prj/d.lst index 6363f9b..f96f3a5 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -1,3 +1,4 @@ +mkdir: %_DEST%\inc%_EXT%\external ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\*.h ..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so.1 symlink: %_DEST%\lib%_EXT%\libraptor.so.1 %_DEST%\lib%_EXT%\libraptor.so diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 853b08c..413163c 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 6306f53..35d6c14 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 04fe44b..bfbb53f 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' |