nss.diff

commit f6f9a2d9f6a04dfdba11283368da82df79ca1c48
Author: q66 <daniel@octaforge.org>
Date:   Mon Feb 10 19:30:41 2020 +0100

    nss: template refactor

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 3b7759647c..d18b0baad9 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -16,6 +16,8 @@ distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/ns
 checksum=185df319775243f5f5daa9d49b7f9cc5f2b389435be3247c3376579bee063ba7
 
 do_build() {
+	local _native_use64 _target_use64
+
 	# Respect LDFLAGS
 	vsed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
 		-i nss/coreconf/rules.mk
@@ -29,8 +31,17 @@ do_build() {
 	export NATIVE_CC="$BUILD_CC"
 	export NATIVE_FLAGS="$BUILD_CFLAGS"
 
-	case "$XBPS_MACHINE" in
-		aarch64*|x86_64*|ppc64*) _native_use64="USE_64=1";;
+	if [ "$XBPS_WORDSIZE" = "64" ]; then
+		_native_use64="USE_64=1"
+	fi
+	if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+		_target_use64="USE_64=1"
+	fi
+
+	# it's actually VSX, so disable on all BE ppc
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64le*) ;;
+		ppc*) export NSS_DISABLE_ALTIVEC=1 ;;
 	esac
 
 	cd nss
@@ -39,14 +50,8 @@ do_build() {
 
 	if [ "$CROSS_BUILD" ]; then
 		case "$XBPS_TARGET_MACHINE" in
-			aarch64*)
-				_ARCH="aarch64"
-				_target_use64="USE_64=1"
-				CFLAGS+=" -DNS_PTR_GT_32"
-				;;
-			ppc64*)
-				_ARCH="ppc64"
-				_target_use64="USE_64=1"
+			aarch64*|ppc64*)
+				_ARCH="${XBPS_TARGET_MACHINE%-*}"
 				CFLAGS+=" -DNS_PTR_GT_32"
 				;;
 			armv7*)
@@ -56,7 +61,7 @@ do_build() {
 				;;
 			arm*) _ARCH="arm";;
 			mips*) _ARCH="mips";;
-			ppc|ppc-musl) _ARCH="ppc";;
+			ppc*) _ARCH="ppc";;
 			*) msg_error "$pkgver: unknown target machine\n";;
 		esac
 		# ... and then copy it to $wrksrc.
@@ -83,6 +88,7 @@ do_build() {
 }
 
 do_check() {
+	local _use_64
 	export LIBRUNPATH=
 	export BUILD_OPT=1
 	export NSS_USE_SYSTEM_SQLITE=1
@@ -95,9 +101,9 @@ do_check() {
 	export NSPR_INCLUDE_DIR=/usr/include/nspr
 	export NSPR_LIB_DIR=/usr/lib
 	export XCFLAGS="${CFLAGS}"
-	case "$XBPS_MACHINE" in
-		aarch64*|x86_64*|ppc64*) _use_64="USE_64=1";;
-	esac
+	if [ "$XBPS_WORDSIZE" = "64" ]; then
+		_use_64="USE_64=1"
+	fi
 	cd nss/tests
 	env $_use_64 HOST=localhost DOMSUF=localdomain ./all.sh
 }