diff options
| -rw-r--r-- | system/git/APKBUILD | 11 | ||||
| -rw-r--r-- | system/nss/APKBUILD | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 8e9a1373d..e8f9a27b0 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -21,7 +21,6 @@ subpackages="$pkgname-doc $pkgname-daemon $pkgname-gitweb $pkgname-subtree::noarch - $pkgname-subtree-doc:subtree_doc:noarch $pkgname-lang " replaces="git-perl perl-git" @@ -165,16 +164,6 @@ subtree() { make install prefix=/usr DESTDIR="$subpkgdir" } -subtree_doc() { - depends="" - pkgdesc="Split git repository into subtrees (documentation)" - replaces="" - - cd "$builddir"/contrib/subtree - make install-man prefix=/usr DESTDIR="$subpkgdir" - gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 -} - sha512sums="1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471 git-2.25.3.tar.xz 0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd 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 |