[arch-commits] Commit in nss/trunk (PKGBUILD)

[Jan de Groot]

    Date: Monday, August 29, 2011 @ 10:43:08
  Author: jgc
Revision: 136449

upgpkg: nss 3.12.11-2

Respect CFLAGS, CXXFLAGS and LDFLAGS

Modified:
  nss/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-29 14:19:50 UTC (rev 136448)
+++ PKGBUILD	2011-08-29 14:43:08 UTC (rev 136449)
@@ -1,8 +1,9 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
+
 pkgname=nss
 pkgver=3.12.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -34,25 +35,27 @@
   # Removes rpath
   patch -Np0 -i "${srcdir}/nss-no-rpath.patch"
 
+  # Respect LDFLAGS
+  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
+      -i mozilla/security/coreconf/rules.mk
+
   cd mozilla/security/nss/lib/ckfw/builtins
   make generate
 
   cd "${srcdir}/${pkgname}-${pkgver}"
-  unset CFLAGS
-  unset CXXFLAGS
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
   export NSS_USE_SYSTEM_SQLITE=1
   export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
   export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
+  export XCFLAGS="${CFLAGS}"
 
   [ "$CARCH" = "x86_64" ] && export USE_64=1
 
   make -j 1 -C mozilla/security/coreconf
   make -j 1 -C mozilla/security/dbm
   make -j 1 -C mozilla/security/nss
-
 }
 
 package() {