summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-08 05:53:42 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-08 05:53:42 +0000
commit3f51d81163fcb453a7b4e19eab7155f738cb07d8 (patch)
treed0aa9ecabd6e8f4107d083699343cc566a8ddc43
parentec21a07ad1293ac3ad10775de7369ecacc52c6af (diff)
downloadpackages-3f51d81163fcb453a7b4e19eab7155f738cb07d8.tar.gz
packages-3f51d81163fcb453a7b4e19eab7155f738cb07d8.tar.bz2
packages-3f51d81163fcb453a7b4e19eab7155f738cb07d8.tar.xz
packages-3f51d81163fcb453a7b4e19eab7155f738cb07d8.zip
system/coreutils: fix bad merge
-rw-r--r--system/coreutils/APKBUILD7
1 files changed, 4 insertions, 3 deletions
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index ff9c92a4b..66f8e0d4d 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -72,10 +72,11 @@ package() {
ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot
}
-bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch
-"
-return 0
sha512sums="25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda coreutils-8.30.tar.xz
bd8b5cecba59eba30458c8afa895877d39a987b989bc06b70cd6836e0ef684677aaadcb4949b58a713779fe1df1e15e3903e9be14e306671b86b69018b75de8b disable-csplit-io-err-test.patch
532ef8210261437855ba3e2fc72ec57b0e0252b2b0f7817990c9629613ece2cdd86cf30aa049f3cff6fbda12ed3bb9a0db3a3642475378ae44ce319bdf005d9b disable-mbrtowc-test.patch
86944e9ea5493c5b21ab62562a63aa134952738297b21cfb2e8f751db4a695ff25ee1592eb231ed1bb80999bc31f7504c7feffde2e93b4e068c05c44ac83cbdf localename-test-fix.patch"
+[ ${CBUILD} != ${CHOST} ] && sha512sums="
+bae804f057252c25452ac178c545dc2c4b4775cbfbdcfd4775edd1a4ed6507882bfac39e2b11ad01b74230ca48d761bf62f11bde5bcbc35a6e5a61cbe4a46e36 051_all_coreutils-mangen.patch
+"
+return 0