strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moz: replace Linux 3.0 workaround with one for 3.x

Browse source
This commit is contained in:
Michael Stahl 2011-10-14 11:07:54 +02:00
parent 7cd58dbe32
commit fa70d98e72
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
moz/makefile.mk
View file

@ -96,7 +96,9 @@ PATCH_FILES = \
patches/brokenmakefile.patch \ patches/brokenmakefile.patch \
patches/aix_build_fix.patch \ patches/aix_build_fix.patch \
patches/libpr0n_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 # This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set) # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)

13
moz/patches/nss-linux3.patch Normal file
View file

@ -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

16
moz/seamonkey-source-1.1.14.patch
View file

@ -6336,22 +6336,6 @@
clean clobber:: clean clobber::
rm -rf $(DIST)/$(APP_NAME).app 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/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 +++ misc/build/mozilla/directory/c-sdk/ldap/libraries/libiutil/Makefile.in 2011-09-07 10:45:16.000000000 +0200
@@ -89,12 +89,9 @@ @@ -89,12 +89,9 @@