diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 14:19:03 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 14:19:03 +0100 |
| commit | c563075efe2697200dec63103e7eeb7184386f37 (patch) | |
| tree | 1e85f6e05c31165c589053c1273ef222d2d4b37c | |
| parent | f3893d26595ba000d4fc1d7e17468c8c2b6d9d82 (diff) | |
| parent | bf3a34df7ace9332084f77bad3fedf2d1bc33bde (diff) | |
CWS-TOOLING: integrate CWS obo43
| -rw-r--r-- | nss/makefile.mk | 7 | ||||
| -rw-r--r-- | nss/nss_macosx.patch | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 2122a168904d..61bcf1a40460 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -49,6 +49,10 @@ TARFILE_NAME=nss_3_12_5 TARFILE_ROOTDIR=mozilla PATCH_FILES=nss.patch +.IF "$(OS)"=="MACOSX" +PATCH_FILES+=nss_macosx.patch +.ENDIF # "$(OS)"=="MACOSX" + .IF "$(debug)" != "" .ELSE BUILD_OPT=1 @@ -70,7 +74,8 @@ USE_64:=1 CPP:=gcc -E $(EXTRA_CFLAGS) CXX:=g++ $(EXTRA_CFLAGS) CC:=gcc $(EXTRA_CFLAGS) -.EXPORT : CPP +MACOS_SDK_DIR*=$(MACDEVSDK) +.EXPORT : CPP MACOS_SDK_DIR .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch new file mode 100644 index 000000000000..d6ce6ff4f8d0 --- /dev/null +++ b/nss/nss_macosx.patch @@ -0,0 +1,12 @@ +--- misc/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 ++++ misc/build/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 +@@ -104,6 +104,9 @@ + ifeq ($(OS_TARGET),WIN95) + NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 + endif ++ifdef MACOS_SDK_DIR ++NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) ++endif + ifdef USE_DEBUG_RTL + NSPR_CONFIGURE_OPTS += --enable-debug-rtl + endif |