1--- misc/nss-3.14.4/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
2+++ misc/build/nss-3.14.4/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
3@@ -73,6 +73,9 @@
4 ifeq ($(OS_TARGET),WIN95)
5 NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
6 endif
7+ifdef MACOS_SDK_DIR
8+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
9+endif
10 ifdef USE_DEBUG_RTL
11 NSPR_CONFIGURE_OPTS += --enable-debug-rtl
12 endif
| 1--- misc/nss-3.14.4/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
2+++ misc/build/nss-3.14.4/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
3@@ -73,6 +73,9 @@
4 ifeq ($(OS_TARGET),WIN95)
5 NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
6 endif
7+ifdef MACOS_SDK_DIR
8+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
9+endif
10 ifdef USE_DEBUG_RTL
11 NSPR_CONFIGURE_OPTS += --enable-debug-rtl
12 endif
|
| 13--- misc/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2012-12-12 13:30:51.000000000 +0100
14+++ misc/build/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2013-10-31 15:45:49.000000000 +0100
15@@ -39,9 +39,9 @@
16 # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5
17 # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable
18 # that code for older versions of Mac OS X. See bug 820374.
19-DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.)
20-DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true)
21-ifeq ($(DARWIN_LT_9),true)
22+OSX_TARGET_MINOR := $(shell echo $(MACOSX_DEPLOYMENT_TARGET) | cut -f2 -d.)
23+OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true)
24+ifeq ($(OSX_MINOR_LT_5),true)
25 OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC
26 endif # Darwin
27 endif
|