Author: pfg
Date: Tue Jul 14 15:37:48 2015
New Revision: 1690992
URL: http://svn.apache.org/r1690992
Log:
Fix nss build on the FreeBSD buildbot.
Submitted by: Don Lewis
Added:
openoffice/trunk/main/nss/nss_freebsd.patch
Modified:
openoffice/trunk/main/nss/makefile.mk
Modified: openoffice/trunk/main/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1690992&r1=1690991&r2=1690992&view=diff
==============================================================================
--- openoffice/trunk/main/nss/makefile.mk (original)
+++ openoffice/trunk/main/nss/makefile.mk Tue Jul 14 15:37:48 2015
@@ -50,6 +50,10 @@ MACOS_SDK_DIR=$(SDK_PATH)
PATCH_FILES+=nss_macosx.patch
.ENDIF # "$(OS)"=="MACOSX"
+.IF "$(OS)"=="FREEBSD"
+PATCH_FILES+=nss_freebsd.patch
+.ENDIF
+
.IF "$(debug)" != ""
.ELSE
BUILD_OPT=1
Added: openoffice/trunk/main/nss/nss_freebsd.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss_freebsd.patch?rev=1690992&view=auto
==============================================================================
--- openoffice/trunk/main/nss/nss_freebsd.patch (added)
+++ openoffice/trunk/main/nss/nss_freebsd.patch Tue Jul 14 15:37:48 2015
@@ -0,0 +1,14 @@
+--- misc/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2012-05-03
09:42:51.000000000 +0000
++++ misc/build/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2015-07-13
23:42:44.915864000 +0000
+@@ -5,9 +5,8 @@
+
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+
+-DEFAULT_COMPILER = gcc
+-CC = gcc
+-CCC = g++
++DEFAULT_COMPILER = $(CC)
++CCC = $(CXX)
+ RANLIB = ranlib
+
+ CPU_ARCH = $(OS_TEST)
