main/abuild: newapkbuild remove explicit return 1

2 files changed, 139 insertions, 2 deletions

diff --git a/main/abuild/0001-remove-explicit-return-1-from-all-sample-APKBUILDs.patch b/main/abuild/0001-remove-explicit-return-1-from-all-sample-APKBUILDs.patch
new file mode 100644
index 0000000000..1935dc0a63
--- /dev/null
+++ b/main/abuild/0001-remove-explicit-return-1-from-all-sample-APKBUILDs.patch
@@ -0,0 +1,135 @@
+From c95263d877ca3ed953de0a114b2c1ccb9aa04b65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
+Date: Tue, 4 Apr 2017 17:55:50 +0200
+Subject: [PATCH 1/2] remove explicit `|| return 1` from all sample APKBUILDs
+
+Those statement are no longer needed because abuild now runs with
+`set -e` by default.
+
+See also: 36d5193776180385a39626a83241822736a5f6b8
+---
+ newapkbuild.in  | 28 +++++++++++++---------------
+ sample.APKBUILD |  6 +++---
+ 2 files changed, 16 insertions(+), 18 deletions(-)
+
+diff --git a/newapkbuild.in b/newapkbuild.in
+index c021db5..bbe7a44 100644
+--- a/newapkbuild.in
++++ b/newapkbuild.in
+@@ -33,7 +33,7 @@ is_github_url() {
+ # Build sections
+ build_make() {
+ 	cat >>APKBUILD<<__EOF__
+-	make || return 1
++	make
+ __EOF__
+ }
+ 
+@@ -45,9 +45,8 @@ build_autotools() {
+ 		--prefix=/usr \\
+ 		--sysconfdir=/etc \\
+ 		--mandir=/usr/share/man \\
+-		--localstatedir=/var \\
+-		|| return 1
+-	make || return 1
++		--localstatedir=/var
++	make
+ __EOF__
+ }
+ 
+@@ -71,29 +70,28 @@ build_cmake() {
+ 		-DCMAKE_BUILD_TYPE=Release \\
+ 		-DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\
+ 		-DCMAKE_C_FLAGS="\$CFLAGS" \\
+-		${CMAKE_CROSSOPTS} \\
+-		|| return 1
+-	make || return 1
++		${CMAKE_CROSSOPTS}
++	make
+ __EOF__
+ }
+ 
+ build_perl() {
+ 	cat >>APKBUILD<<__EOF__
+-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
+-	make || return 1
++	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
++	make
+ __EOF__
+ }
+ 
+ build_python() {
+ 	cat >>APKBUILD<<__EOF__
+-	python setup.py build || return 1
++	python setup.py build
+ __EOF__
+ }
+ 
+ # Package sections
+ package_make() {
+ 	cat >>APKBUILD<<__EOF__
+-	make DESTDIR="\$pkgdir" install || return 1
++	make DESTDIR="\$pkgdir" install
+ __EOF__
+ }
+ 
+@@ -103,14 +101,14 @@ package_autotools() {
+ 
+ package_perl() {
+ 	cat >>APKBUILD<<__EOF__
+-	make DESTDIR="\$pkgdir" install || return 1
++	make DESTDIR="\$pkgdir" install
+ 	find "\$pkgdir" \\( -name perllocal.pod -o -name .packlist \\) -delete
+ __EOF__
+ }
+ 
+ package_python() {
+ 	cat >>APKBUILD<<__EOF__
+-	python setup.py install --prefix=/usr --root="\$pkgdir" || return 1
++	python setup.py install --prefix=/usr --root="\$pkgdir"
+ __EOF__
+ }
+ 
+@@ -273,9 +271,9 @@ __EOF__
+ 		cat >>APKBUILD<<__EOF__
+ 
+ 	install -m755 -D "\$srcdir"/\$pkgname.initd \\
+-		"\$pkgdir"/etc/init.d/\$pkgname || return 1
++		"\$pkgdir"/etc/init.d/\$pkgname
+ 	install -m644 -D "\$srcdir"/\$pkgname.confd \\
+-		"\$pkgdir"/etc/conf.d/\$pkgname || return 1
++		"\$pkgdir"/etc/conf.d/\$pkgname
+ __EOF__
+ 	fi
+ 	cat >>APKBUILD<<__EOF__
+diff --git a/sample.APKBUILD b/sample.APKBUILD
+index 30184c5..95a6634 100644
+--- a/sample.APKBUILD
++++ b/sample.APKBUILD
+@@ -31,12 +31,12 @@ build() {
+ 		--sysconfdir=/etc \
+ 		--mandir=/usr/share/man \
+ 		--infodir=/usr/share/info
+-	make || return 1
++	make
+ }
+ 
+ package() {
+ 	cd "$builddir"
+-	make DESTDIR="$pkgdir" install || return 1
++	make DESTDIR="$pkgdir" install
+ 
+ 	# remove the 2 lines below (and this) if there is no init.d script
+ 	# install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+@@ -47,7 +47,7 @@ check() {
+ 	# uncomment the 2 lines below if there is a testsuite.  we assume the testsuite
+ 	# is run using "make check", which is the default for autotools-based build systems.
+ 	# cd "$builddir"
+-	# make check || return 1
++	# make check
+ }
+ 
+ md5sums="" #generate with 'abuild checksum'
+-- 
+2.12.2
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 8070ef6b44..6db6384167 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=abuild
 pkgver=3.0.0_rc2
 _ver=${pkgver%_git*}
-pkgrel=5
+pkgrel=6
 pkgdesc="Script to build Alpine Packages"
 url="http://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -24,6 +24,7 @@ source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
 	0001-abuild-wrap-check-with-fakeroot.patch
 	0001-abuild-set-e-fix-for-update_config_-sub-guess.patch
 	0001-abuild-Add-support-for-lzip-source-packages.patch
+	0001-remove-explicit-return-1-from-all-sample-APKBUILDs.patch
 	"
 
 builddir="$srcdir/$pkgname-$_ver"
@@ -70,4 +71,5 @@ sha512sums="bb6fa7af3144db99839c24db63e17179d73f659a76c86d530923158b37fad3fcd73e
 65e0605a23a5f8df6024533b054ce6e098bfc1431220d8487e9d5f521aede7c0c8fc47f5f119d868da48d8f69e6fbc3fe101f71e3415a66797829623bb5a7a48  0001-abuild-use-new-PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH-env.patch
 0e5b64ad175efc4a06197a5e131878e5532539c78ffd8d5aa28a99c9684aa6eec8bc95fdca1c99b916a58c61ddf8d0b7602b1bc9aee276f7a40d82f970c0ad7c  0001-abuild-wrap-check-with-fakeroot.patch
 dda641f0ce2bddc8f3d7cf4a3538afe699bda56a5172bd56104de7252796da20025ed36f9401220d8e2fd072297efad94da4be4ed8831e9f9d14ad75c9c8859d  0001-abuild-set-e-fix-for-update_config_-sub-guess.patch
-084171ed1e276c02f58dfade28c013d0160fb8a7b87ee03684ffb16c2bb1c64f8b9d98adc947c7b0211ba7fb2d8ef2c590abd9fed80676db52b7829da495d291  0001-abuild-Add-support-for-lzip-source-packages.patch"
+084171ed1e276c02f58dfade28c013d0160fb8a7b87ee03684ffb16c2bb1c64f8b9d98adc947c7b0211ba7fb2d8ef2c590abd9fed80676db52b7829da495d291  0001-abuild-Add-support-for-lzip-source-packages.patch
+51d506f657388215979b551f79a98c46f17c6deba719ec9f0fd7ffc0fd3583fc2870123e309f08c4b7a8958e1742168ec91a57901efc6a72277bb6039807132c  0001-remove-explicit-return-1-from-all-sample-APKBUILDs.patch"