summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/make/APKBUILD15
-rw-r--r--system/make/fix-atexit-exit.patch4
2 files changed, 7 insertions, 12 deletions
diff --git a/system/make/APKBUILD b/system/make/APKBUILD
index 7f8639199..6459c306f 100644
--- a/system/make/APKBUILD
+++ b/system/make/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=make
-pkgver=4.2.1
-pkgrel=2
+pkgver=4.3
+pkgrel=0
pkgdesc="GNU make utility to maintain groups of programs"
url="https://www.gnu.org/software/make"
arch="all"
@@ -10,15 +10,10 @@ depends=""
checkdepends="perl"
makedepends=""
subpackages="$pkgname-doc $pkgname-lang"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
fix-atexit-exit.patch
"
-prepare() {
- update_config_sub
- default_prepare
-}
-
build() {
./configure \
--build=$CBUILD \
@@ -37,5 +32,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 make-4.2.1.tar.bz2
-a1639d9caf84a24a9f161a30d8b5dcd079b13faf2a5e3d514ff39fa11b13e796c7ff34c46ac2b56656d52129b4d3627c6102b129a4ab011f065076d872ef3992 fix-atexit-exit.patch"
+sha512sums="9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b make-4.3.tar.gz
+ce638cf5689d384f961a92b186d9f53f34764b6ab55deca8cc284fc2192a981d4d896cf58ab764b032e9b09fe50d238c9b3031712bf94e368428174372307a45 fix-atexit-exit.patch"
diff --git a/system/make/fix-atexit-exit.patch b/system/make/fix-atexit-exit.patch
index a71d26fb5..bce562f90 100644
--- a/system/make/fix-atexit-exit.patch
+++ b/system/make/fix-atexit-exit.patch
@@ -4,8 +4,8 @@ POSIX says the behaviour is undefined if atexit callback calls
exit(). On glibc it works, but on musl it does not. Call instead
_exit() which is guaranteed to work.
---- ./output.c.orig
-+++ ./output.c
+--- make-4.3/src/output.c
++++ make-4.3/src/output.c
@@ -495,7 +495,7 @@
perror_with_name (_("write error: stdout"), "");
else