diff options
| -rw-r--r-- | system/coreutils/APKBUILD | 11 | ||||
| -rw-r--r-- | system/nss/APKBUILD | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index 4f9c1ddea..a9d65cccf 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -30,13 +30,15 @@ build() { LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ + --prefix=/ \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ + --datarootdir=/usr/share \ + --libexecdir=/usr/libexec \ --enable-nls \ --without-gmp \ - --enable-no-install-program=hostname,su,kill,uptime \ + --enable-no-install-program=groups,hostname,su,kill,uptime \ --enable-install-program=arch \ --with-packager="Adélie" \ --with-packager-bug-reports="https://bts.adelielinux.org/" @@ -55,8 +57,9 @@ check() { package() { make DESTDIR="$pkgdir" install - rm -rf "$pkgdir"/usr/lib/charset.alias - rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true + # stdbuf(1) requires a /usr/libexec/ .so + mkdir -p "$pkgdir"/usr/bin + mv "$pkgdir"/bin/stdbuf "$pkgdir"/usr/bin/ } sha512sums="ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af coreutils-8.31.tar.xz diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD index 2699bd658..9c41ced39 100644 --- a/system/nss/APKBUILD +++ b/system/nss/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nss -pkgver=3.44 +pkgver=3.44.1 _ver=${pkgver//./_} pkgrel=0 pkgdesc="Mozilla Network Security Services" @@ -141,7 +141,7 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="c4d7343a66f91c5888a121e266d1f1471da798a21d608a29caf598a828725e4bf9ea7411a105b23335f20bd7c12788dad567922ceeaebeb0c98fbf9bbe4006f7 nss-3.44.tar.gz +sha512sums="eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169 nss-3.44.1.tar.gz 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09 nss-util.pc.in 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15 nss-softokn.pc.in |