diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2011-12-15 03:16:45 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2011-12-15 03:16:45 +0000 |
| commit | 44581dd4bbf43375790ebd107a8dbde361b66de6 (patch) | |
| tree | e24e7fa67bf6dab2fba34679cb880894d92f5ba0 /moz/patches | |
| parent | 519332eab45048a78fef459f1cfd5ef09fb0f42d (diff) | |
moz/nss: missing Linux3.X.mk in security/coreconf
Applied upstream patch.
Vid. https://bugzilla.mozilla.org/show_bug.cgi?id=661609
Diffstat (limited to 'moz/patches')
| -rw-r--r-- | moz/patches/nss_linux.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/moz/patches/nss_linux.patch b/moz/patches/nss_linux.patch new file mode 100644 index 000000000000..167b1f0cf904 --- /dev/null +++ b/moz/patches/nss_linux.patch @@ -0,0 +1,35 @@ +diff -uNrp misc/mozilla/security/coreconf/config.mk misc/build/mozilla/security/coreconf/config.mk +--- misc/mozilla/security/coreconf/config.mk 2008-06-15 19:22:15.000000000 -0300 ++++ misc/build/mozilla/security/coreconf/config.mk 2011-12-14 22:27:52.383209720 -0300 +@@ -63,7 +63,7 @@ endif + ####################################################################### + + TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ +- OpenVMS AIX ++ OpenVMS AIX Linux + + ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) + include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk +diff -uNrp misc/mozilla/security/coreconf/Linux.mk misc/build/mozilla/security/coreconf/Linux.mk +--- misc/mozilla/security/coreconf/Linux.mk 2011-12-14 22:26:12.391200222 -0300 ++++ misc/build/mozilla/security/coreconf/Linux.mk 2011-12-14 22:29:30.183219009 -0300 +@@ -177,3 +177,19 @@ G++INCLUDES = -I/usr/include/g++ + # Always set CPU_TAG on Linux, OpenVMS, WINCE. + # + CPU_TAG = _$(CPU_ARCH) ++ ++OS_REL_CFLAGS += -DLINUX2_1 ++MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH) ++ ++ifdef MAPFILE ++ MKSHLIB += -Wl,--version-script,$(MAPFILE) ++endif ++PROCESS_MAP_FILE = grep -v ';-' $< | \ ++ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ ++ ++ifeq ($(OS_RELEASE),2.4) ++# Softoken 3.13 uses NO_FORK_CHECK only. ++# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK. ++# Don't use NO_CHECK_FORK in new code. ++DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK ++endif |