You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2011/12/15 05:16:45 UTC
svn commit: r1214619 - in /incubator/ooo/trunk/main: moz/makefile.mk
moz/patches/nss_linux.patch nss/makefile.mk nss/nss_linux.patch
Author: arielch
Date: Thu Dec 15 04:16:45 2011
New Revision: 1214619
URL: http://svn.apache.org/viewvc?rev=1214619&view=rev
Log:
moz/nss: missing Linux3.X.mk in security/coreconf
Applied upstream patch.
Vid. https://bugzilla.mozilla.org/show_bug.cgi?id=661609
Added:
incubator/ooo/trunk/main/moz/patches/nss_linux.patch (with props)
incubator/ooo/trunk/main/nss/nss_linux.patch (with props)
Modified:
incubator/ooo/trunk/main/moz/makefile.mk
incubator/ooo/trunk/main/nss/makefile.mk
Modified: incubator/ooo/trunk/main/moz/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/makefile.mk?rev=1214619&r1=1214618&r2=1214619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/moz/makefile.mk (original)
+++ incubator/ooo/trunk/main/moz/makefile.mk Thu Dec 15 04:16:45 2011
@@ -90,6 +90,10 @@ PATCH_FILES = \
patches/link_fontconfig.patch \
patches/brokenmakefile.patch
+.IF "$(OS)"=="LINUX"
+PATCH_FILES+=patches/nss_linux.patch
+.ENDIF
+
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
.IF "$(COM)"=="GCC"
@@ -424,15 +428,3 @@ $(OUT)$/zipped$/$(OS)$(COM)UBruntime.zip
.ENDIF # $(GUIBASE)=="aqua"
.INCLUDE : extractfiles.mk
-
-# This is a hack to build on a Linux 3.0 system. Between unpacking
-# the archive and building it, the existing Linux2.6.mk makefile is
-# copied to Linux3.0.mk, which otherwise would be missing and break
-# the build. See nss module for a similar hack.
-# If someone finds a better solution then please change this.
-.IF "$(OS)"=="LINUX"
-BUILD_ACTION:= pwd&&$(COPY) \
- ../../mozilla/security/coreconf/Linux2.6.mk \
- ../../mozilla/security/coreconf/Linux3.0.mk \
- && $(BUILD_ACTION)
-.ENDIF
Added: incubator/ooo/trunk/main/moz/patches/nss_linux.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/moz/patches/nss_linux.patch?rev=1214619&view=auto
==============================================================================
--- incubator/ooo/trunk/main/moz/patches/nss_linux.patch (added)
+++ incubator/ooo/trunk/main/moz/patches/nss_linux.patch Thu Dec 15 04:16:45 2011
@@ -0,0 +1,35 @@
+diff -uNrp misc/mozilla/security/coreconf/config.mk misc/build/mozilla/security/coreconf/config.mk
+--- misc/mozilla/security/coreconf/config.mk 2008-06-15 19:22:15.000000000 -0300
++++ misc/build/mozilla/security/coreconf/config.mk 2011-12-14 22:27:52.383209720 -0300
+@@ -63,7 +63,7 @@ endif
+ #######################################################################
+
+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+- OpenVMS AIX
++ OpenVMS AIX Linux
+
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+diff -uNrp misc/mozilla/security/coreconf/Linux.mk misc/build/mozilla/security/coreconf/Linux.mk
+--- misc/mozilla/security/coreconf/Linux.mk 2011-12-14 22:26:12.391200222 -0300
++++ misc/build/mozilla/security/coreconf/Linux.mk 2011-12-14 22:29:30.183219009 -0300
+@@ -177,3 +177,19 @@ G++INCLUDES = -I/usr/include/g++
+ # Always set CPU_TAG on Linux, OpenVMS, WINCE.
+ #
+ CPU_TAG = _$(CPU_ARCH)
++
++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,;.*,;,' > $@
++
++ifeq ($(OS_RELEASE),2.4)
++# Softoken 3.13 uses NO_FORK_CHECK only.
++# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
++# Don't use NO_CHECK_FORK in new code.
++DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
++endif
Propchange: incubator/ooo/trunk/main/moz/patches/nss_linux.patch
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ooo/trunk/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/nss/makefile.mk?rev=1214619&r1=1214618&r2=1214619&view=diff
==============================================================================
--- incubator/ooo/trunk/main/nss/makefile.mk (original)
+++ incubator/ooo/trunk/main/nss/makefile.mk Thu Dec 15 04:16:45 2011
@@ -91,6 +91,7 @@ BUILD_ACTION= $(GNUMAKE) nss_build_all
#See #i105566# && moz#513024#
.IF "$(OS)"=="LINUX"
BUILD_ACTION+=FREEBL_NO_DEPEND=1
+PATCH_FILES+=nss_linux.patch
.ENDIF
.ENDIF # "$(GUI)"=="UNX"
@@ -179,15 +180,3 @@ OUTDIR2INC=mozilla$/dist$/public$/nss mo
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
-
-# This is a hack to build on a Linux 3.0 system. Between unpacking
-# the archive and building it, the existing Linux2.6.mk makefile is
-# copied to Linux3.0.mk, which otherwise would be missing and break
-# the build. See moz module for a similar hack.
-# If someone finds a better solution then please change this.
-.IF "$(OS)"=="LINUX"
-BUILD_ACTION:= $(COPY) \
- ../../../mozilla/security/coreconf/Linux2.6.mk \
- ../../../mozilla/security/coreconf/Linux3.0.mk \
- && $(BUILD_ACTION)
-.ENDIF
Added: incubator/ooo/trunk/main/nss/nss_linux.patch
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/nss/nss_linux.patch?rev=1214619&view=auto
==============================================================================
--- incubator/ooo/trunk/main/nss/nss_linux.patch (added)
+++ incubator/ooo/trunk/main/nss/nss_linux.patch Thu Dec 15 04:16:45 2011
@@ -0,0 +1,34 @@
+diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/config.mk misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk
+--- misc/nss-3.12.6/mozilla/security/coreconf/config.mk 2009-08-25 19:35:11.000000000 -0300
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk 2011-12-14 14:07:30.979358265 -0300
+@@ -63,7 +63,7 @@ endif
+ #######################################################################
+
+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+- AIX RISCOS WINNT WIN95 WINCE
++ AIX RISCOS WINNT WIN95 WINCE Linux
+
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk
+--- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:06:50.112354384 -0300
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:07:30.978358265 -0300
+@@ -179,3 +179,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr
+ endif
+ endif
+
++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,;.*,;,' > $@
++
++ifeq ($(OS_RELEASE),2.4)
++# Softoken 3.13 uses NO_FORK_CHECK only.
++# Softoken 3.12 uses NO_FORK_CHECK and NO_CHECK_FORK.
++# Don't use NO_CHECK_FORK in new code.
++DEFINES += -DNO_FORK_CHECK -DNO_CHECK_FORK
++endif
Propchange: incubator/ooo/trunk/main/nss/nss_linux.patch
------------------------------------------------------------------------------
svn:eol-style = native