diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-10-11 18:06:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-10-11 18:07:47 +0200 |
| commit | ab3895465a6cf0a8a41c7432ad9a8f77df7ae572 (patch) | |
| tree | ddaeafaad2497ba27818c92c4eb0db81476ac21c /nss | |
| parent | d3d533c9e45b6badf202a12f0ed266d0168aa636 (diff) | |
nss: replace Linux 3.0 workaround with one for 3.x
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/makefile.mk | 2 | ||||
| -rw-r--r-- | nss/nss-linux3.patch | 13 | ||||
| -rw-r--r-- | nss/nss.patch | 14 |
3 files changed, 14 insertions, 15 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 75ebb2157fff..9fdc9e601074 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -48,7 +48,7 @@ VER_PATCH=8 TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.8.6 TARFILE_MD5=71474203939fafbe271e1263e61d083e TARFILE_ROOTDIR=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) -PATCH_FILES=nss.patch nss.aix.patch nss-config.patch +PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch .IF "$(OS)"=="MACOSX" PATCH_FILES+=nss_macosx.patch diff --git a/nss/nss-linux3.patch b/nss/nss-linux3.patch new file mode 100644 index 000000000000..62c667f9a48f --- /dev/null +++ b/nss/nss-linux3.patch @@ -0,0 +1,13 @@ +--- misc/nss-3.12.8/mozilla/security/coreconf/arch.mk 2011-10-06 19:58:31.808695724 +0200 ++++ misc/build/nss-3.12.8/mozilla/security/coreconf/arch.mk 2011-10-06 19:58:00.074648943 +0200 +@@ -152,6 +152,10 @@ + + ifeq ($(OS_ARCH),Linux) + OS_RELEASE := $(subst ., ,$(OS_RELEASE)) ++ # force Linux 3.x to 2.6 ++ ifeq ($(word 1,$(OS_RELEASE)),3) ++ OS_RELEASE := 2 6 ++ endif + ifneq ($(words $(OS_RELEASE)),1) + OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE)) + endif diff --git a/nss/nss.patch b/nss/nss.patch index ac24855660b4..6930e6753ac9 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -189,17 +189,3 @@ endif CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) ---- /dev/null 2011-07-24 19:07:44.290563140 +0200 -+++ misc/build/nss-3.12.8/mozilla/security/coreconf/Linux3.0.mk 2011-07-24 22:21:02.710513995 +0200 -@@ -0,0 +1,11 @@ -+include $(CORE_DEPTH)/coreconf/Linux.mk -+ -+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,;.*,;,' > $@ -+ |