From ad45974ccac8f119f8d1325d20fef144190ac7fb Mon Sep 17 00:00:00 2001 From: John Ogness Date: Sat, 6 Feb 2021 01:05:48 +0100 Subject: system/perl: fix zlib-src removal With commit e220d74d9f3d ("system/perl: bump to 5.26.2, modernize, remove dumbnes") an unnecessary "return 1" on sed failure was removed. However, the || was not removed. This led to the following line (removal of zlib-src) not being executed. Remove the trailing || to allow zlib-src removal. Signed-off-by: John Ogness --- system/perl/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system') diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD index 7e23f0a82..726a2daa4 100644 --- a/system/perl/APKBUILD +++ b/system/perl/APKBUILD @@ -5,7 +5,7 @@ # Proxy-For: solar pkgname=perl pkgver=5.26.3 -pkgrel=1 +pkgrel=2 pkgdesc="Larry Wall's Practical Extraction and Report Language" url="https://www.perl.org/" arch="all" @@ -41,7 +41,7 @@ prepare() { default_prepare sed -e 's/less -R/less/g' \ -e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \ - -i ./Configure || + -i ./Configure # Ensure that we never accidentally bundle zlib or bzip2 rm -rf cpan/Compress-Raw-Zlib/zlib-src -- cgit v1.2.3-70-g09d2