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 @@ -6483,7 +6486,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 +20,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 @@ -33,19 +37,20 @@
  35  ifeq (arm,$(CPU_ARCH))
  36  # Nothing set for arm currently.
  37  else
  38 -OS_REL_CFLAGS  = -Dppc
  39 -CC              += -arch ppc
  40 -CCC             += -arch ppc
  41  endif
  42  endif
  43
  44  ifneq (,$(MACOS_SDK_DIR))
  45 +    CLANG_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "clang version" | sed -e "s/^.*clang version[  ]*//" | awk '{ print $$1 }')
  46      GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
  47      GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
  48      GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
  49      GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
  50 +    ifneq (,$(CLANG_VERSION_FULL))
  51 +        DARWIN_SDK_CFLAGS = -isysroot $(MACOS_SDK_DIR)
  52 +        DARWIN_SDK_SHLIBFLAGS = -isysroot $(MACOS_SDK_DIR)
  53
  54 -    ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
  55 +    else ifeq (,$(filter-out 2 3,$(GCC_VERSION_MAJOR)))
  56          # GCC <= 3
  57          DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
  58          ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
  59 @@ -108,7 +113,7 @@
  60  # May override this with different compatibility and current version numbers.
  61  DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
  62  # May override this with -bundle to create a loadable module.
  63 -DSO_LDOPTS     = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
  64 +DSO_LDOPTS     = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @__________________________________________________OOO/$(notdir $@) -headerpad_max_install_names
  65
  66  ifdef USE_GCOV
  67     OS_CFLAGS += --coverage
  68 diff -ru a/nss/Makefile b/nss/Makefile
  69 --- a/a/nss/Makefile    2014-09-29 16:50:22.990304789 +0100
  70 +++ b/b/nss/Makefile    2014-09-29 16:51:59.207931908 +0100
  71 @@ -82,6 +82,9 @@
  72  ifeq ($(OS_TARGET),WIN95)
  73  NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
  74  endif
  75 +ifdef MACOS_SDK_DIR
  76 +NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
  77 +endif
  78  ifdef USE_DEBUG_RTL
  79  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  80  endif