aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice-4/files/patch-nss-gcc46
blob: e3358a9e28e8e31b223ec82eaa8aad9fd50ef4da (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
--- nss/makefile.mk.orig	2013-08-13 11:46:06.000000000 +0000
+++ nss/makefile.mk	2014-01-01 18:13:26.000000000 +0000
@@ -44,6 +44,10 @@
 TARFILE_ROOTDIR=nss-3.12.6
 PATCH_FILES=nss.patch
 
+.IF "$(OS)"=="FREEBSD"
+PATCH_FILES+=nss_freebsd.patch
+.ENDIF # "$(OS)"=="FREEBSD"
+
 .IF "$(OS)"=="MACOSX"
 MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
 .EXPORT : MACOS_SDK_DIR
--- nss/nss_freebsd.patch.orig	1970-01-01 00:00:00.000000000 +0000
+++ nss/nss_freebsd.patch	2014-01-01 18:08:20.000000000 +0000
@@ -0,0 +1,11 @@
+--- misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk.orig	2009-08-22 05:33:09.000000000 +0000
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/FreeBSD.mk	2014-01-01 13:47:48.000000000 +0000
+@@ -38,7 +38,7 @@
+ include $(CORE_DEPTH)/coreconf/UNIX.mk
+ 
+ DEFAULT_COMPILER	= gcc
+-CC			= gcc
++#CC			= gcc
+ CCC			= g++
+ RANLIB			= ranlib
+