From 0d254ba91b6634455624ef098aa3434e15a9dfb7 Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Thu, 8 Aug 2013 17:35:33 +0200
Subject: [PATCH] nss: fixed cflags.

Patch by Danny Rawlins
---
 nss/Pkgfile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nss/Pkgfile b/nss/Pkgfile
index 1059fad01..2161cc73f 100644
--- a/nss/Pkgfile
+++ b/nss/Pkgfile
@@ -5,7 +5,7 @@
 
 name=nss
 version=3.15.1
-release=1
+release=2
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/$name-$version.tar.gz \
         nss-config.in nss.pc.in)
 
@@ -14,18 +14,15 @@ build() {
 
     local file
 
-         # Do not override CC from commands.mk
-         # CCC is unused for g++, comment out
-         # And respect system CFLAGS
-        # sed -i mozilla/security/coreconf/Linux.mk \
-        #         -e 's|^CC.*=.*gcc$|#&|' \
-        #         -e 's|^CCC.*=.*g++$|#&|' \
-        #         -e "s|^OS_CFLAGS.*= |& $CFLAGS |"
+    sed -i nss/coreconf/Linux.mk \
+        -e 's|^CC.*=.*gcc$|#&|' \
+        -e 's|^CCC.*=.*g++$|#&|'
 
     export NSPR_INCLUDE_DIR=/usr/include/nspr
     export NSPR_LIB_DIR=/usr/lib
     export NSS_USE_SYSTEM_SQLITE=1
     export BUILD_OPT=1
+    export XCFLAGS="${CFLAGS}"
 
     make -j1 USE_64=1 -C nss all