diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-11-13 18:18:27 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 16:00:55 +0100 |
commit | 226e89180c7959795394f7f0b7d4202c31e59187 (patch) | |
tree | 9e52423776c3f8ca7c6a07904980ae7a3fb4b816 /external | |
parent | ea4d69f5e81d7109ba06dd68252c9e92233c0ab4 (diff) |
nss: move Darwin stuff from nss.patch to nss_macosx.patch
Change-Id: I5fc7cdbcdf079edb101f6a8c3851c4cf4f92e258
Diffstat (limited to 'external')
-rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 2 | ||||
-rw-r--r-- | external/nss/nss.patch | 63 | ||||
-rw-r--r-- | external/nss/nss_macosx.patch | 59 |
3 files changed, 60 insertions, 64 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 888e1ecc6466..15a02d2197b8 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.patch \ external/nss/nss.aix.patch \ external/nss/nss-3.13.5-zlib-werror.patch \ - $(if $(filter MACOSX,$(OS)),external/nss/nss_macosx.patch) \ + external/nss/nss_macosx.patch \ $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \ $(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \ external/nss/nss-3.13.3-build.patch.3 \ diff --git a/external/nss/nss.patch b/external/nss/nss.patch index d7f13e537a7d..37caae09aeb7 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -9,49 +9,6 @@ _OPTIMIZE_FLAGS=-O2 _DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that # combo is not yet good at debugging inlined ---- a/a/nss/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 -+++ b/b/nss/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 -@@ -39,8 +39,12 @@ - - DEFAULT_COMPILER = gcc - --CC = gcc --CCC = g++ -+# CC is taken from environment automatically. -+#CC = cc -+# Use CCC from environment. -+#CCC = c++ -+CCC = $(CXX) -+ - RANLIB = ranlib - - ifndef CPU_ARCH -@@ -57,19 +57,25 @@ - - ifeq (,$(filter-out i%86,$(CPU_ARCH))) - ifdef USE_64 -+ifeq (,$(findstring -arch ,$(CC))) - CC += -arch x86_64 -+endif - override CPU_ARCH = x86_64 - else - OS_REL_CFLAGS = -Di386 -+ifeq (,$(findstring -arch ,$(CC))) - CC += -arch i386 -+endif - override CPU_ARCH = x86 - endif - else - ifeq (arm,$(CPU_ARCH)) - # Nothing set for arm currently. - else - OS_REL_CFLAGS = -Dppc -+ifeq (,$(findstring -arch ,$(CC))) - CC += -arch ppc -+endif - endif - endif - --- a/a/nss/coreconf/FreeBSD.mk 2009-11-23 05:06:29.000000000 -0500 +++ b/b/nss/coreconf/FreeBSD.mk 2012-08-28 20:27:20.000000000 -0400 @@ -57,6 +57,7 @@ @@ -186,23 +143,3 @@ endif endif ---- a/a/nss/coreconf/Darwin.mk -+++ b/b/nss/coreconf/Darwin.mk -@@ -64,12 +64,16 @@ - endif - - ifneq (,$(MACOS_SDK_DIR)) -+ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }') - GCC_VERSION_FULL := $(shell $(CC) -dumpversion) - GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }') - GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }') - GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR) -+ ifneq (,$(CLANG_VERSION_FULL)) -+ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR) -+ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR) - -- ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) -+ else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) - # GCC <= 3 - DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks - ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0)) diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch index ce64074b6336..ca625cb5bb79 100644 --- a/external/nss/nss_macosx.patch +++ b/external/nss/nss_macosx.patch @@ -56,6 +56,65 @@ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir) --- a/a/nss/coreconf/Darwin.mk +++ b/b/nss/coreconf/Darwin.mk +@@ -39,8 +39,12 @@ + + DEFAULT_COMPILER = gcc + +-CC = gcc +-CCC = g++ ++# CC is taken from environment automatically. ++#CC = cc ++# Use CCC from environment. ++#CCC = c++ ++CCC = $(CXX) ++ + RANLIB = ranlib + + ifndef CPU_ARCH +@@ -57,19 +57,25 @@ + + ifeq (,$(filter-out i%86,$(CPU_ARCH))) + ifdef USE_64 ++ifeq (,$(findstring -arch ,$(CC))) + CC += -arch x86_64 ++endif + override CPU_ARCH = x86_64 + else + OS_REL_CFLAGS = -Di386 ++ifeq (,$(findstring -arch ,$(CC))) + CC += -arch i386 ++endif + override CPU_ARCH = x86 + endif + else + ifeq (arm,$(CPU_ARCH)) + # Nothing set for arm currently. + else + OS_REL_CFLAGS = -Dppc ++ifeq (,$(findstring -arch ,$(CC))) + CC += -arch ppc ++endif + endif + endif + +@@ -64,12 +64,16 @@ + endif + + ifneq (,$(MACOS_SDK_DIR)) ++ CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[ ]*//" | awk '{ print $$1 }') + GCC_VERSION_FULL := $(shell $(CC) -dumpversion) + GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }') + GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }') + GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR) ++ ifneq (,$(CLANG_VERSION_FULL)) ++ DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR) ++ DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR) + +- ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) ++ else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR))) + # GCC <= 3 + DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks + ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0)) @@ -150,7 +150,7 @@ # May override this with different compatibility and current version numbers. DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1 |