external/nss/nss_macosx.patch

   1 diff -ru a/nspr/configure b/nspr/configure
   2 --- a/a/nspr/configure  2014-09-29 16:50:33.907375937 +0100
   3 +++ b/b/nspr/configure  2014-09-29 16:51:59.213931947 +0100
   4 @@ -6577,7 +6579,7 @@
   5
   6
   7      DSO_CFLAGS=-fPIC
   8 -    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
   9 +    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names'
  10      _OPTIMIZE_FLAGS=-O2
  11      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
  12      STRIP="$STRIP -x -S"
  13 diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
  14 --- a/a/nss/coreconf/Darwin.mk  2014-09-29 16:50:22.992304799 +0100
  15 +++ b/b/nss/coreconf/Darwin.mk  2014-09-29 16:51:59.214931953 +0100
  16 @@ -20,13 +24,17 @@
  17
  18  ifeq (,$(filter-out i%86,$(CPU_ARCH)))
  19  ifdef USE_64
  20 +ifeq (,$(findstring -arch ,$(CC)))
  21  CC              += -arch x86_64
  22  CCC             += -arch x86_64
  23 +endif
  24  override CPU_ARCH      = x86_64
  25  else
  26  OS_REL_CFLAGS  = -Di386
  27 +ifeq (,$(findstring -arch ,$(CC)))
  28  CC              += -arch i386
  29  CCC             += -arch i386
  30 +endif
  31  override CPU_ARCH      = x86
  32  endif
  33  else
  34 @@ -40,12 +48,16 @@
  35  endif
  36
  37  ifneq (,$(MACOS_SDK_DIR))
  38 +    CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[  ]*//" | awk '{ print $$1 }')
  39      GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
  40      GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
  41      GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
  42      GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
  43 +    ifneq (,$(CLANG_VERSION_FULL))
  44 +        DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR)
  45 +        DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR)
  46
  47 -    ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
  48 +    else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
  49          # GCC <= 3
  50          DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
  51          ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
  52 @@ -108,7 +120,7 @@
  53  # May override this with different compatibility and current version numbers.
  54  DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
  55  # May override this with -bundle to create a loadable module.
  56 -DSO_LDOPTS     = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
  57 +DSO_LDOPTS     = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @__________________________________________________OOO/$(notdir $@) -headerpad_max_install_names
  58
  59  ifdef USE_GCOV
  60     OS_CFLAGS += --coverage
  61 diff -ru a/nss/Makefile b/nss/Makefile
  62 --- a/a/nss/Makefile    2014-09-29 16:50:22.990304789 +0100
  63 +++ b/b/nss/Makefile    2014-09-29 16:51:59.207931908 +0100
  64 @@ -72,6 +72,9 @@
  65  ifeq ($(OS_TARGET),WIN95)
  66  NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
  67  endif
  68 +ifdef MACOS_SDK_DIR
  69 +NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
  70 +endif
  71  ifdef USE_DEBUG_RTL
  72  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  73  endif