diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
| commit | c326b2f169abf875912d8d40485eead41926981d (patch) | |
| tree | 47e6a13d3411d6b43c9d4ade11ac2a34314e4ebb /berkeleydb | |
| parent | 81341944540166215d0d166bbabc2f579308b546 (diff) | |
| parent | 084b3d7eae29d9e9e6e1a65054ffe4d11cda3576 (diff) | |
CWS-TOOLING: integrate CWS sb118
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/db-4.7.25.patch | 9 | ||||
| -rw-r--r-- | berkeleydb/makefile.mk | 5 |
2 files changed, 2 insertions, 12 deletions
diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch index c97522f62612..8cf412d23e25 100644 --- a/berkeleydb/db-4.7.25.patch +++ b/berkeleydb/db-4.7.25.patch @@ -646,7 +646,7 @@ + --- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200 +++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200 -@@ -1 +1,81 @@ +@@ -1 +1,76 @@ -dummy +PRJ=..$/..$/..$/.. +PRJNAME=libdb47 @@ -658,11 +658,6 @@ +CFLAGS+=-GS -EHsc -Gy + +#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/) -+.IF "$(USE_SHELL)"!="4nt" -+BUILD_ACTION_SEP=; -+.ELSE # "$(USE_SHELL)"!="4nt" -+BUILD_ACTION_SEP=^ -+.ENDIF # "$(USE_SHELL)"!="4nt" + +CHILDREN= \ + btree clib common cxx \ @@ -720,7 +715,7 @@ +ALLTAR : $(CHILDREN) + +$(CHILDREN) .PHONY : -+ cd $@ $(BUILD_ACTION_SEP) $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS) ++ cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS) + +.INCLUDE : target.mk + diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index eb1ce22a8c4f..963c61a3bbde 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -161,11 +161,6 @@ OUT2INC= \ # make use of stlport headerfiles EXT_USE_STLPORT=TRUE -.IF "$(USE_SHELL)"!="4nt" -BUILD_ACTION_SEP=; -.ELSE # "$(USE_SHELL)"!="4nt" -BUILD_ACTION_SEP=^ -.ENDIF # "$(USE_SHELL)"!="4nt" BUILD_DIR= BUILD_ACTION=dmake |