diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-10-14 11:07:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-10-18 17:39:09 +0200 |
| commit | fa70d98e729c0dba44e1c8e25fe1323bad918945 (patch) | |
| tree | 923d03e9d99e6830974310d322dfcba58aa52c5d /moz | |
| parent | 7cd58dbe32e5421986216dd7c6b24a4bb0b9c1e5 (diff) | |
moz: replace Linux 3.0 workaround with one for 3.x
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 4 | ||||
| -rw-r--r-- | moz/patches/nss-linux3.patch | 13 | ||||
| -rw-r--r-- | moz/seamonkey-source-1.1.14.patch | 16 |
3 files changed, 16 insertions, 17 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 15480f54b830..020fa693208a 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -96,7 +96,9 @@ PATCH_FILES = \ patches/brokenmakefile.patch \ patches/aix_build_fix.patch \ patches/libpr0n_build_fix.patch \ - patches/macosx_build_fix.patch + patches/macosx_build_fix.patch \ + patches/nss-linux3.patch \ + # This file is needed for the W32 build when BUILD_MOZAB is set # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) diff --git a/moz/patches/nss-linux3.patch b/moz/patches/nss-linux3.patch new file mode 100644 index 000000000000..b73566932323 --- /dev/null +++ b/moz/patches/nss-linux3.patch @@ -0,0 +1,13 @@ +--- misc/mozilla/security/coreconf/arch.mk 2011-10-06 19:58:31.808695724 +0200 ++++ misc/build/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/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch index 248ee65ac156..eb602e6b23f3 100644 --- a/moz/seamonkey-source-1.1.14.patch +++ b/moz/seamonkey-source-1.1.14.patch @@ -6336,22 +6336,6 @@ clean clobber:: rm -rf $(DIST)/$(APP_NAME).app ---- /dev/null 2011-07-24 19:07:44.290563140 +0200 -+++ misc/build/mozilla/security/coreconf/Linux3.0.mk 2011-07-24 22:21:02.710513995 +0200 -@@ -0,0 +1,13 @@ -+include $(CORE_DEPTH)/coreconf/Linux.mk -+ -+DSO_LDOPTS += -Wl,-z,defs -+ -+OS_REL_CFLAGS += -DLINUX2_1 -+MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+ -+ifdef MAPFILE -+ MKSHLIB += -Wl,--version-script,$(MAPFILE) -+endif -+PROCESS_MAP_FILE = grep -v ';-' $< | \ -+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ -+ --- misc/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in 2006-02-03 15:44:41.000000000 +0100 +++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in 2011-09-07 10:45:16.000000000 +0200 @@ -89,12 +89,9 @@ |