summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-05-05 03:24:13 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-05-05 03:24:13 +0000
commita2fa7dc1a27961d625ed32d3187599a248a3089a (patch)
treeaf12875bf1036e0258a0c0a1148e54ee5ded3b6b
parentddab973f7c870f6140ed1144671a453ad3fc850d (diff)
parentdb3f223c76bd252b421b6f6cb4ef94e6c84561e7 (diff)
downloadpackages-a2fa7dc1a27961d625ed32d3187599a248a3089a.tar.gz
packages-a2fa7dc1a27961d625ed32d3187599a248a3089a.tar.bz2
packages-a2fa7dc1a27961d625ed32d3187599a248a3089a.tar.xz
packages-a2fa7dc1a27961d625ed32d3187599a248a3089a.zip
Merge branch 'fix/nss' into 'master'
system/nss: fix baseline ppc* support See merge request adelie/packages!439
-rw-r--r--system/nss/APKBUILD13
1 files changed, 12 insertions, 1 deletions
diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD
index 687e938fd..944668272 100644
--- a/system/nss/APKBUILD
+++ b/system/nss/APKBUILD
@@ -3,7 +3,7 @@
pkgname=nss
pkgver=3.51
_ver=$(printf '%s' "$pkgver" | tr . _)
-pkgrel=0
+pkgrel=1
pkgdesc="Mozilla Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
arch="all"
@@ -49,6 +49,17 @@ build() {
case "$CARCH" in
*64* | s390x) export USE_64=1;;
esac
+
+ # This actually enables -mvsx and -mcrypto too, and those can't
+ # be turned off separately in this case:
+ #
+ # altivec-types.h:20:1: error: use of _long long_ in AltiVec
+ # types is invalid without _-mvsx_
+ #
+ # typedef __vector signed long long vec_s64;
+ # ^~~~~~~
+ export NSS_DISABLE_ALTIVEC=1
+
make -j 1 -C nss/coreconf
make -j 1 -C nss/lib/dbm
make -j 1 -C nss