Author: hdu
Date: Thu Nov 7 13:30:35 2013
New Revision: 1539632
URL: http://svn.apache.org/r1539632
Log:
#i123637# fix nss build for OSX<10.5 targets on newer OSX hosts
change the check from host OS version to the OSX deployment target
Modified:
openoffice/trunk/main/nss/nss_macosx.patch
Modified: openoffice/trunk/main/nss/nss_macosx.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss_macosx.patch?rev=1539632&r1=1539631&r2=1539632&view=diff
==============================================================================
--- openoffice/trunk/main/nss/nss_macosx.patch (original)
+++ openoffice/trunk/main/nss/nss_macosx.patch Thu Nov 7 13:30:35 2013
@@ -10,3 +10,18 @@
ifdef USE_DEBUG_RTL
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
+--- misc/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2012-12-12
13:30:51.000000000 +0100
++++ misc/build/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk
2013-10-31 15:45:49.000000000 +0100
+@@ -39,9 +39,9 @@
+ # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5
+ # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable
+ # that code for older versions of Mac OS X. See bug 820374.
+-DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.)
+-DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true)
+-ifeq ($(DARWIN_LT_9),true)
++OSX_TARGET_MINOR := $(shell echo $(MACOSX_DEPLOYMENT_TARGET) | cut -f2 -d.)
++OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true)
++ifeq ($(OSX_MINOR_LT_5),true)
+ OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC
+ endif # Darwin
+ endif
