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

[Jan Steffens]

    Date: Friday, June 9, 2017 @ 12:08:20
  Author: heftig
Revision: 298482

3.31-2: Use gyp to build, as requested by upstream

Modified:
  nss/trunk/PKGBUILD

----------+
 PKGBUILD |   73 +++++++++++++++++++++----------------------------------------
 1 file changed, 26 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-09 11:33:16 UTC (rev 298481)
+++ PKGBUILD	2017-06-09 12:08:20 UTC (rev 298482)
@@ -4,15 +4,15 @@
 pkgbase=nss
 pkgname=(nss ca-certificates-mozilla)
 pkgver=3.31
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Security Services"
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 arch=(i686 x86_64)
-license=('MPL' 'GPL')
-_nsprver=4.12
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh' 'p11-kit')
-makedepends=('perl' 'python2' 'xmlto' 'docbook-xsl')
-options=('!strip' '!makeflags' 'staticlibs')
+license=(MPL GPL)
+_nsprver=4.15
+depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
+makedepends=(perl python2 xmlto docbook-xsl gyp)
+options=(!strip !makeflags staticlibs)
 source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgbase}-${pkgver}.tar.gz"
         certdata2pem.py bundle.sh nss.pc.in nss-config.in nss-config.xml)
 sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
@@ -23,17 +23,16 @@
             '98ace873c63e8e870286bce3ed53249aa2655cc1f53e7049061476e650ab06f1')
 
 prepare() {
-  mkdir certs
+  mkdir certs path
 
+  ln -s /usr/bin/python2 path/python
+
   echo -n "$(date +"%e %B %Y")" >date.xml
   echo -n "$pkgver" >version.xml
+  xmlto man nss-config.xml
 
   cd nss-$pkgver
 
-  # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
-      -i nss/coreconf/rules.mk
-
   ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
   ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
 }
@@ -40,8 +39,6 @@
 
 
 build() {
-  xmlto man nss-config.xml
-
   cd certs
   python2 ../certdata2pem.py
 
@@ -49,31 +46,15 @@
   sh bundle.sh
 
   cd nss-$pkgver/nss
-  export BUILD_OPT=1
-  export NSS_USE_SYSTEM_SQLITE=1
-  export NSS_ALLOW_SSLKEYLOGFILE=1
-  export NSS_ENABLE_ECC=1
-  export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
-  export NSPR_LIB_DIR="`nspr-config --libdir`"
-  export XCFLAGS="${CFLAGS} -Wno-error=int-in-bool-context"
-
-  [[ $CARCH == x86_64 ]] && export USE_64=1
-
-  make -C coreconf
-  make -C lib/dbm
-  make
-  make clean_docs build_docs
+  PATH="$srcdir/path:$PATH" ./build.sh --opt --system-sqlite --system-nspr -v
 }
 
 package_nss() {
   cd nss-$pkgver
 
-  install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig,share/man/man1}
+  { read _vmajor; read _vminor; read _vpatch; } \
+    < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' nss/lib/nss/nss.h)
 
-  NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
-  NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}')
-  NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}')
-
   sed ../nss.pc.in \
     -e "s,%libdir%,/usr/lib,g" \
     -e "s,%prefix%,/usr,g" \
@@ -80,8 +61,8 @@
     -e "s,%exec_prefix%,/usr/bin,g" \
     -e "s,%includedir%,/usr/include/nss,g" \
     -e "s,%NSPR_VERSION%,${_nsprver},g" \
-    -e "s,%NSS_VERSION%,${pkgver},g" \
-    > "$pkgdir/usr/lib/pkgconfig/nss.pc"
+    -e "s,%NSS_VERSION%,${pkgver},g" |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/pkgconfig/nss.pc"
   ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
 
   sed ../nss-config.in \
@@ -89,26 +70,24 @@
     -e "s, at prefix@,/usr/bin,g" \
     -e "s, at exec_prefix@,/usr/bin,g" \
     -e "s, at includedir@,/usr/include/nss,g" \
-    -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-    -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-    -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-    > "$pkgdir/usr/bin/nss-config"
-  chmod 755 "$pkgdir/usr/bin/nss-config"
+    -e "s, at MOD_MAJOR_VERSION@,${_vmajor},g" \
+    -e "s, at MOD_MINOR_VERSION@,${_vminor},g" \
+    -e "s, at MOD_PATCH_VERSION@,${_vpatch},g" |
+    install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
 
-  install -t "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1 ../nss-config.1
+  install -Dt "$pkgdir/usr/share/man/man1" -m644 nss/doc/nroff/*.1 ../nss-config.1
 
   cd dist
-  install -t "$pkgdir/usr/include/nss" -m644 public/nss/*.h
+  install -Dt "$pkgdir/usr/include/nss" -m644 public/nss/*.h
 
-  cd *.OBJ/bin
-  install -t "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver ssltap vfychain vfyserv
+  cd Release/bin
+  install -Dt "$pkgdir/usr/bin" *util derdump pp shlibsign signtool signver ssltap vfychain vfyserv
 
   cd ../lib
-  install -t "$pkgdir/usr/lib" *.so
-  install -t "$pkgdir/usr/lib" -m644 *.chk libcrmf.a
+  install -Dt "$pkgdir/usr/lib" *.so
+  install -Dt "$pkgdir/usr/lib" -m644 *.chk
 
-  rm "$pkgdir/usr/lib/libnssckbi.so"
-  ln -s libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
+  ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib/libnssckbi.so"
 }
 
 package_ca-certificates-mozilla() {