office-gobmx/nss/nss_macosx.patch
Michael Stahl 7e6a07a6d2 nss: upgrade to 3.13.5
- drop nss-linux3.patch, builds out of the box on Linux 3.x now
- drop nss-string-concat.patch, was fixed upstream
- drop nss-clang_os_Linux_x86_s_comments.patch
       nss-clang_os_Linux_x86_64_s_comments.patch
  the invalid asm comments were fixed upstream:
  https://bugzilla.mozilla.org/show_bug.cgi?id=624868
- drop nss-asm-fix.patch, fixed upstream:
  https://bugzilla.mozilla.org/show_bug.cgi?id=671711
- not updated nss.patch.mingw since it looks unmaintained
- remove the setting of FREEBL_NO_DEPEND, which is
  a) no longer necessary, because it will be set automatically
     on Linux 2.6
  b) harmful because it prevents automatic setting of FREEBL_LOWHASH,
     which is necessary to prevent conflicts with system libfreebl3.so
     at least on Fedora 16/17

Change-Id: Idf9338d83f9b34000068c1b8691ca3135f56dd21
2012-07-16 18:19:10 +02:00

12 lines
441 B
Diff

--- misc/nss-3.13.5/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
+++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
@@ -104,6 +104,9 @@
ifeq ($(OS_TARGET),WIN95)
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
endif
+ifdef MACOS_SDK_DIR
+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR)
+endif
ifdef USE_DEBUG_RTL
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif