From a3d5bb5ee81069e375a72c2313c1b439306e30f3 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 9 Feb 2018 20:56:54 -0600
Subject: main/make: modernise, move test to check()

The test relies on 64 being the maximum number of fds.
Otherwise it will fail on ppc/ppc64.
---
 main/make/APKBUILD | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

(limited to 'main/make/APKBUILD')

diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 4fc238fedc..6843986cae 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=make
 pkgver=4.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="GNU make utility to maintain groups of programs"
 url="https://www.gnu.org/software/make"
 arch="all"
@@ -12,41 +12,33 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
 	fix-atexit-exit.patch
 	"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	cd "$builddir"
+	update_config_sub
+	default_prepare
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--disable-nls \
-		|| return 1
-	make || return 1
+		--disable-nls
+	make
+}
 
-	[ "$CBUILD" != "$CHOST" ] || make check || return 1
-	return 0
+check() {
+	cd "$builddir"
+	[ "$CBUILD" != "$CHOST" ] || (ulimit -n 64 && PERL5LIB=. make check) || return 1
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
-md5sums="15b012617e7c44c0ed482721629577ac  make-4.2.1.tar.bz2
-842902e4a28f29e953f022f80b3ce57c  fix-atexit-exit.patch"
-sha256sums="d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589  make-4.2.1.tar.bz2
-ecf0edef6b8cf173d2f792c61f5a3e6f289d789e9b9ce5ff9186c6c17022bd87  fix-atexit-exit.patch"
 sha512sums="9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8  make-4.2.1.tar.bz2
 a1639d9caf84a24a9f161a30d8b5dcd079b13faf2a5e3d514ff39fa11b13e796c7ff34c46ac2b56656d52129b4d3627c6102b129a4ab011f065076d872ef3992  fix-atexit-exit.patch"
-- 
cgit v1.2.3