1diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/config.mk misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk 2--- misc/nss-3.12.6/mozilla/security/coreconf/config.mk 2009-08-25 19:35:11.000000000 -0300 3+++ misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk 2011-12-14 14:07:30.979358265 -0300 4@@ -63,7 +63,7 @@ endif 5 ####################################################################### 6 7 TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ 8- AIX RISCOS WINNT WIN95 WINCE 9+ AIX RISCOS WINNT WIN95 WINCE Linux 10 11 ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) 12 include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk 13diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 14--- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:06:50.112354384 -0300 15+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:07:30.978358265 -0300 16@@ -179,3 +179,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr 17 endif 18 endif 19 20+OS_REL_CFLAGS += -DLINUX2_1 21+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH) 22+ 23+ifdef MAPFILE 24+ MKSHLIB += -Wl,--version-script,$(MAPFILE) 25+endif 26+PROCESS_MAP_FILE = grep -v ';-' $< | \ 27+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ 28+ 29+ifeq ($(OS_RELEASE),2.4) 30+# Softoken 3.13 uses NO_FORK_CHECK only. 31+# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK. 32+# Don't use NO_CHECK_FORK in new code. 33+DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK 34+endif 35