diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-07-22 19:43:53 +0000 |
| commit | b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71 (patch) | |
| tree | 5948e97345062a759a5ab8d355b0b49849abcfcf /system/coreutils | |
| parent | d61220e97e3a4fec8c1e43970cb1408f790c2c2e (diff) | |
| parent | 6bd200ed124893c95fda0335b684b26eba0bb743 (diff) | |
| download | packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.gz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.bz2 packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.xz packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.zip | |
Merge branch 'bashisms' into 'master'
Purge bashisms, adduser, and addgroup from packages.git
See merge request adelie/packages!293
Diffstat (limited to 'system/coreutils')
| -rw-r--r-- | system/coreutils/APKBUILD | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD index e5461c7d2..4a70574c3 100644 --- a/system/coreutils/APKBUILD +++ b/system/coreutils/APKBUILD @@ -9,10 +9,10 @@ url="https://www.gnu.org/software/coreutils/" arch="all" license="GPL-3.0+" makedepends="bash acl-dev attr-dev" -[ ${CBUILD} == ${CHOST} ] && makedepends="$makedepends perl gettext-tiny +[ "${CBUILD}" = "${CHOST}" ] && makedepends="$makedepends perl gettext-tiny gettext-tiny-dev utmps-dev" subpackages="$pkgname-doc" -[ ${CBUILD} == ${CHOST} ] && subpackages="$subpackages $pkgname-lang" +[ "${CBUILD}" = "${CHOST}" ] && subpackages="$subpackages $pkgname-lang" install="$pkgname.post-deinstall" source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz date-debug.patch @@ -22,7 +22,7 @@ source="https://ftp.gnu.org/gnu/coreutils/$pkgname-$pkgver.tar.xz gnulib-test-fixes.patch localename-test-fix.patch " -[ ${CBUILD} != ${CHOST} ] && source="$source +[ "${CBUILD}" != "${CHOST}" ] && source="$source 051_all_coreutils-mangen.patch " @@ -43,9 +43,10 @@ build() { --with-packager="Adélie" \ --with-packager-bug-reports="https://bts.adelielinux.org/" - if [ ${CBUILD} != ${CHOST} ]; then - set -- man/*.x - touch ${@/%x/1} + if [ "${CBUILD}" != "${CHOST}" ]; then + for i in man/*.x; do + touch "${i%x}1" + done fi make } @@ -70,7 +71,7 @@ bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a7 fd97fccd661befc558b3afb3e32c82dd2cef511a05e6129d49540599297c1b59ab1f109e63a12f585a2348c26c28fb98330c348829d1fe61cf8149d0dd1c989c gnulib-tests-dont-require-gpg-passphrase.patch a1d014a683fb3b2e08e7392f7589fd92a565e2a4d0cac1cf960968dd3d990e020fdd3bb6aea2bbeaca3ba8f2522b4da3d75b93f414ebf83d8b26b5ccbb38a64d gnulib-test-fixes.patch aac3a89b27a7854fbf483e155df9133c3d33a0f36bd55d5606559a7781f9d27d5c17779ea427142311749252767097bf92ec22d4cf86b510568c186da84ff16c date-debug.patch" -[ ${CBUILD} != ${CHOST} ] && sha512sums=" +[ "${CBUILD}" != "${CHOST}" ] && sha512sums=" bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch " return 0 |