external/nss/nss-ios.patch

   1 --- a/a/nspr/config/autoconf.mk.in
   2 +++ a/a/nspr/config/autoconf.mk.in
   3 @@ -67,7 +67,7 @@
   4  MSC_VER                = @MSC_VER@
   5  AR             = @AR@
   6  AR_FLAGS       = @AR_FLAGS@
   7 -LD             = @LD@
   8 +LD             = echo
   9  RANLIB         = @RANLIB@
  10  PERL           = @PERL@
  11  RC             = @RC@
  12 --- a/a/nspr/configure
  13 +++ a/a/nspr/configure
  14 @@ -755,7 +755,7 @@
  15  OBJDIR='$(OBJDIR_NAME)'
  16  OBJDIR_NAME=.
  17  OBJDIR_SUFFIX=OBJ
  18 -NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'
  19 +NSINSTALL=${NSINSTALL?'$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall'}
  20  NOSUCHFILE=/no-such-file
  21  LIBNSPR='-L$(dist_libdir) -lnspr$(MOD_MAJOR_VERSION)'
  22  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  23 @@ -3060,7 +3060,7 @@
  24  LIB_SUFFIX=a
  25  DLL_SUFFIX=so
  26  ASM_SUFFIX=s
  27 -MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
  28 +MKSHLIB='touch $@; echo'
  29  PR_MD_ASFILES=
  30  PR_MD_CSRCS=
  31  PR_MD_ARCH_DIR=unix
  32 @@ -3904,7 +3904,7 @@
  33      DSO_CFLAGS=-fPIC
  34      DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names'
  35      _OPTIMIZE_FLAGS=-O2
  36 -    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
  37 +    MKSHLIB=touch $@
  38      STRIP="$STRIP -x -S"
  39      DLL_SUFFIX=dylib
  40      USE_PTHREADS=1
  41 --- a/a/nss/coreconf/ruleset.mk
  42 +++ a/a/nss/coreconf/ruleset.mk
  43 @@ -68,7 +68,7 @@
  44  endif
  45
  46  ifeq ($(MKPROG),)
  47 -    MKPROG = $(CC)
  48 +    MKPROG = touch $@; echo
  49  endif
  50
  51  #
  52 --- a/a/nss/coreconf/Darwin.mk
  53 +++ a/a/nss/coreconf/Darwin.mk
  54 @@ -124,7 +124,7 @@
  55  # May override this with -bundle to create a loadable module.
  56  DSO_LDOPTS     = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @__________________________________________________OOO/$(notdir $@) -headerpad_max_install_names
  57
  58 -MKSHLIB                = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
  59 +MKSHLIB                = touch $@; echo
  60  DLL_SUFFIX     = dylib
  61  ifdef MAPFILE
  62         MKSHLIB += -exported_symbols_list $(MAPFILE)
  63 --- a/a/nss/coreconf/UNIX.mk
  64 +++ a/a/nss/coreconf/UNIX.mk
  65 @@ -21,10 +21,14 @@
  66
  67  ifdef BUILD_TREE
  68  NSINSTALL_DIR  = $(BUILD_TREE)/nss
  69 +ifndef NSINSTALL
  70  NSINSTALL      = $(BUILD_TREE)/nss/nsinstall
  71 +endif
  72  else
  73  NSINSTALL_DIR  = $(CORE_DEPTH)/coreconf/nsinstall
  74 +ifndef NSINSTALL
  75  NSINSTALL      = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall
  76 +endif
  77  endif
  78
  79  MKDEPEND_DIR    = $(CORE_DEPTH)/coreconf/mkdepend
  80 --- a/a/nspr/pr/include/md/_darwin.h
  81 +++ a/a/nspr/pr/include/md/_darwin.h
  82 @@ -26,6 +26,8 @@
  83  #define _PR_SI_ARCHITECTURE "ppc"
  84  #elif defined(__arm__)
  85  #define _PR_SI_ARCHITECTURE "arm"
  86 +#elif defined(__arm64__)
  87 +#define _PR_SI_ARCHITECTURE "arm64"
  88  #elif defined(__aarch64__)
  89  #define _PR_SI_ARCHITECTURE "aarch64"
  90  #else
  91 --- a/a/nspr/pr/src/Makefile.in
  92 +++ a/a/nspr/pr/src/Makefile.in
  93 @@ -180,7 +180,7 @@
  94  endif
  95
  96  ifeq ($(OS_TARGET),MacOSX)
  97 -OS_LIBS                = -framework CoreServices -framework CoreFoundation
  98 +OS_LIBS                = -framework CoreFoundation
  99  endif
 100
 101  EXTRA_LIBS += $(OS_LIBS)
 102 --- a/a/nss/cmd/shlibsign/sign.sh
 103 +++ a/a/nss/cmd/shlibsign/sign.sh
 104 @@ -2,6 +2,8 @@
 105  # This Source Code Form is subject to the terms of the Mozilla Public
 106  # License, v. 2.0. If a copy of the MPL was not distributed with this
 107  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 108 +
 109 +exit 0
 110
 111  # arguments:
 112  # 1: full path to DIST/OBJDIR (parent dir of "lib")