10ae430aaSDon Lewisdiff -ur misc/nss-3.39/nss/lib/sqlite/config.mk misc/build/nss-3.39/nss/lib/sqlite/config.mk 20ae430aaSDon Lewis--- misc/nss-3.39/nss/lib/sqlite/config.mk 2018-08-31 05:55:53.000000000 -0700 30ae430aaSDon Lewis+++ misc/build/nss-3.39/nss/lib/sqlite/config.mk 2018-09-10 10:36:01.074375000 -0700 4e32eb42eStruckman@@ -35,9 +35,9 @@ 5e094edcfSHerbert Dürr # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5 6e094edcfSHerbert Dürr # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable 7e094edcfSHerbert Dürr # that code for older versions of Mac OS X. See bug 820374. 8e094edcfSHerbert Dürr-DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.) 9e094edcfSHerbert Dürr-DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true) 10e094edcfSHerbert Dürr-ifeq ($(DARWIN_LT_9),true) 11e094edcfSHerbert Dürr+OSX_TARGET_MINOR := $(shell echo $(MACOSX_DEPLOYMENT_TARGET) | cut -f2 -d.) 12e094edcfSHerbert Dürr+OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true) 13e094edcfSHerbert Dürr+ifeq ($(OSX_MINOR_LT_5),true) 14e094edcfSHerbert Dürr OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC 15e094edcfSHerbert Dürr endif 16e32eb42eStruckman endif # Darwin 17*94670cb6SArrigo Marchiori--- misc/nss-3.39/nss/coreconf/UNIX.mk 2021-09-07 01:32:04.000000000 -0400 18*94670cb6SArrigo Marchiori+++ misc/build/nss-3.39/nss/coreconf/UNIX.mk 2021-09-07 01:32:11.000000000 -0400 19*94670cb6SArrigo Marchiori@@ -63,4 +63,4 @@ 20*94670cb6SArrigo Marchiori if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi 21*94670cb6SArrigo Marchiori endef 22*94670cb6SArrigo Marchiori 23*94670cb6SArrigo Marchiori-include $(CORE_DEPTH)/coreconf/Werror.mk 24*94670cb6SArrigo Marchiori+#include $(CORE_DEPTH)/coreconf/Werror.mk 25*94670cb6SArrigo Marchiori--- misc/nss-3.39/nss/coreconf/Darwin.mk 2021-09-07 14:24:22.000000000 -0400 26*94670cb6SArrigo Marchiori+++ misc/build/nss-3.39/nss/coreconf/Darwin.mk 2021-09-07 14:24:30.000000000 -0400 27*94670cb6SArrigo Marchiori@@ -8,6 +8,9 @@ 28*94670cb6SArrigo Marchiori RANLIB ?= ranlib 29*94670cb6SArrigo Marchiori 30*94670cb6SArrigo Marchiori include $(CORE_DEPTH)/coreconf/UNIX.mk 31*94670cb6SArrigo Marchiori-include $(CORE_DEPTH)/coreconf/Werror.mk 32*94670cb6SArrigo Marchiori+#include $(CORE_DEPTH)/coreconf/Werror.mk 33*94670cb6SArrigo Marchiori+ 34*94670cb6SArrigo Marchiori+CXXFLAGS += -stdlib=libc++ 35*94670cb6SArrigo Marchiori+LDFLAGS += -stdlib=libc++ 36*94670cb6SArrigo Marchiori 37*94670cb6SArrigo Marchiori DEFAULT_COMPILER = gcc 38*94670cb6SArrigo Marchiori@@ -108,7 +111,7 @@ 39*94670cb6SArrigo Marchiori # May override this with different compatibility and current version numbers. 40*94670cb6SArrigo Marchiori DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 41*94670cb6SArrigo Marchiori # May override this with -bundle to create a loadable module. 42*94670cb6SArrigo Marchiori-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names 43*94670cb6SArrigo Marchiori+DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -stdlib=libc++ 44*94670cb6SArrigo Marchiori 45*94670cb6SArrigo Marchiori ifdef USE_GCOV 46*94670cb6SArrigo Marchiori OS_CFLAGS += --coverage 47