nss/nss_macosx.patch

   1 --- misc/nss-3.13.5/mozilla/security/nss/Makefile       2008-12-03 00:24:39.000000000 +0100
   2 +++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
   3 @@ -104,6 +104,9 @@
   4  ifeq ($(OS_TARGET),WIN95)
   5  NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
   6  endif
   7 +ifdef MACOS_SDK_DIR
   8 +NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
   9 +endif
  10  ifdef USE_DEBUG_RTL
  11  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  12  endif
  13 --- misc/nss-3.13.5/mozilla/nsprpub/configure
  14 +++ misc/build/nss-3.13.5/mozilla/nsprpub/configure
  15 @@ -3888,7 +3889,7 @@
  16  fi
  17
  18      DSO_CFLAGS=-fPIC
  19 -    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
  20 +    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @__________________________________________________OOO/$@ -headerpad_max_install_names'
  21      _OPTIMIZE_FLAGS=-O2
  22      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
  23      STRIP="$STRIP -x -S"
  24 --- misc/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
  25 +++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
  26 @@ -143,7 +143,7 @@
  27
  28  export:: $(TARGETS)
  29         $(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
  30 -       $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
  31 +       $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
  32  ifdef SHARED_LIBRARY
  33  ifeq ($(OS_ARCH),HP-UX)
  34         $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
  35 --- misc/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
  36 +++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
  37 @@ -144,7 +144,7 @@
  38  #
  39
  40  export:: $(TARGETS)
  41 -       $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
  42 +       $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
  43  ifdef SHARED_LIBRARY
  44  ifeq ($(OS_ARCH),HP-UX)
  45         $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
  46 --- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
  47 +++ misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
  48 @@ -365,7 +365,7 @@
  49  #
  50
  51  build:: $(TARGETS)
  52 -       $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
  53 +       $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
  54  ifdef SHARED_LIBRARY
  55  ifeq ($(OS_ARCH),HP-UX)
  56         $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
  57 --- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
  58 +++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
  59 @@ -150,7 +150,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  MKSHLIB                = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
  67  DLL_SUFFIX     = dylib