Changeset ac00c8f for npl/overig/mozilla_nss/mozilla-nss.SlackBuild.orig

Timestamp:

09/30/19 19:59:45 (6 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master

Children:

9befa48

Parents:

42fa616

Message:

update to libreswan 3.29

File:

• npl/overig/mozilla_nss/mozilla-nss.SlackBuild.orig (modified) (6 diffs)

npl/overig/mozilla_nss/mozilla-nss.SlackBuild.orig

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright 2005, 2006, 2008, 2009, 2010, 2012  Eric Hameleers, Eindhoven, NL
-# Copyright 2013, 2014, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2013, 2014, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -23 +23 @@
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=mozilla-nss
 SRCNAM=nss
-VERSION=${VERSION:-3.23}
-NSPR=${NSPR:-4.12}
+VERSION=${VERSION:-3.46}
+NSPR=${NSPR:-4.22}
 BUILD=${BUILD:-1}
 
@@ -39 +41 @@
     *)       export ARCH=$MARCH ;;
   esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
 fi
 
@@ -56 +66 @@
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
 # Seems parallel build does not work with this.
-#NUMJOBS=${NUMJOBS:-" -j7 "}
+#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
 rm -rf $PKG
@@ -69 +78 @@
 rm -rf nss-${VERSION}
 rm -rf nspr-${NSPR}
-tar xvf $CWD/nss-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/nss-$VERSION.tar.?z || exit 1
 cd nss-$VERSION
-tar xvf $CWD/nspr-$NSPR.tar.?z* || exit 1
+tar xvf $CWD/nspr-$NSPR.tar.?z || exit 1
 mv nspr*/nspr .
+
+# -Werror is problematic with gcc7:
+sed -i "s|\ -Werror| |" nss/coreconf/Werror.mk || exit 1
 
 # Make sure ownerships and permissions are sane:
@@ -92 +104 @@
 cd nss
   # Seems parallel build does not work with this.
-  #make $NUMJOBS nss_build_all export
-  make nss_build_all export
+  #make $NUMJOBS nss_build_all export || exit 1
+  make nss_build_all export || exit 1
 cd -