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