nss/makefile.mk | 4 ++++
nss/nss_freebsd.patch | 14 ++++++++++++++
rat-excludes | 2 ++
3 files changed, 20 insertions(+)
New commits:
commit 6a731e4f0ea7516cea0a72c513adaed599bc6e30
Author: Pedro Giffuni <p...@apache.org>
Date: Tue Jul 14 15:37:48 2015 +0000
Fix nss build on the FreeBSD buildbot.
Submitted by: Don Lewis
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 60275aa..c14dc47 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -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
diff --git a/nss/nss_freebsd.patch b/nss/nss_freebsd.patch
new file mode 100644
index 0000000..53df536
--- /dev/null
+++ b/nss/nss_freebsd.patch
@@ -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)
commit 497e752ca86d1dc57d0afacdcaf4049102f027e3
Author: Regina Henschel <reg...@apache.org>
Date: Tue Jul 14 14:36:27 2015 +0000
Add rat excludes
Patch by: Gavin McDonald <gmcdon...@apache.org>
see d...@openoffice.apache.org 'Rat Patch take 2'
diff --git a/rat-excludes b/rat-excludes
index e61a603..918191d 100644
--- a/rat-excludes
+++ b/rat-excludes
@@ -1492,4 +1492,6 @@ main/winenv.set*
main/ooxml/source/framework/OOXMLViewer/.settings/org.eclipse.jdt.core.prefs
main/ooxml/source/framework/SchemaParser/.settings/org.eclipse.jdt.core.prefs
+main/ooxml/source/framework/JavaOOXMLParser/.settings/org.eclipse.jdt.core.prefs
+main/ooxml/source/framework/JavaPartManager/.settings/org.eclipse.jdt.core.prefs
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
