xref: /trunk/main/nss/nss_linux.patch (revision c38ced1b)
1diff -uNrp misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk
2--- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk	2011-12-14 14:06:50.112354384 -0300
3+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk	2011-12-14 14:07:30.978358265 -0300
4@@ -174,3 +174,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr
5 endif
6 endif
7
8+OS_REL_CFLAGS   += -DLINUX2_1
9+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) $(RPATH)
10+
11+ifdef MAPFILE
12+	MKSHLIB += -Wl,--version-script,$(MAPFILE)
13+endif
14+PROCESS_MAP_FILE = grep -v ';-' $< | \
15+        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
16+
17+ifeq ($(OS_RELEASE),2.4)
18+# Softoken 3.13 uses NO_FORK_CHECK only.
19+# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
20+# Don't use NO_CHECK_FORK in new code.
21+DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
22+endif
23