aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-10-06 11:20:23 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-10-06 11:38:20 +0000
commit63cfa35c3faece43f4b86411bace1bea78b96a27 (patch)
treeb94e62342d890816657de13aa61a6c904c178948 /main
parentf69cd6ee3f1a8b333301748fa8e6f02cf3c6eb07 (diff)
downloadaports-63cfa35c3faece43f4b86411bace1bea78b96a27.tar.bz2
aports-63cfa35c3faece43f4b86411bace1bea78b96a27.tar.xz
main/make: upgrade to 4.1
Diffstat (limited to 'main')
-rw-r--r--main/make/APKBUILD14
-rw-r--r--main/make/fix-atexit-exit.patch15
2 files changed, 14 insertions, 15 deletions
diff --git a/main/make/APKBUILD b/main/make/APKBUILD
index 4b21db7f4c..32afebcd71 100644
--- a/main/make/APKBUILD
+++ b/main/make/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=make
-pkgver=4.0
+pkgver=4.1
pkgrel=0
pkgdesc="GNU make utility to maintain groups of programs"
url="http://www.gnu.org/software/make"
@@ -43,9 +43,9 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="571d470a7647b455e3af3f92d79f1c18 make-4.0.tar.bz2
-5d7764fa6d9c0cb9764e8d4d2c77d5c3 fix-atexit-exit.patch"
-sha256sums="e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb make-4.0.tar.bz2
-5547bdccf4e4941de9e155c8bdb01e5b9a7a8536dcdce0b277f5f5e29f416076 fix-atexit-exit.patch"
-sha512sums="82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376 make-4.0.tar.bz2
-da0a54038eb40a8cd8d092298fc8a6b16c33f72dc9a7739bc9bafbb0c66eb17e25f078f75010d34f0df9c62f505a3c3ab0a9795259064a9e5785d25ffbc79318 fix-atexit-exit.patch"
+md5sums="57a7a224a822f94789a587ccbcedff69 make-4.1.tar.bz2
+842902e4a28f29e953f022f80b3ce57c fix-atexit-exit.patch"
+sha256sums="0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5 make-4.1.tar.bz2
+ecf0edef6b8cf173d2f792c61f5a3e6f289d789e9b9ce5ff9186c6c17022bd87 fix-atexit-exit.patch"
+sha512sums="3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 make-4.1.tar.bz2
+a1639d9caf84a24a9f161a30d8b5dcd079b13faf2a5e3d514ff39fa11b13e796c7ff34c46ac2b56656d52129b4d3627c6102b129a4ab011f065076d872ef3992 fix-atexit-exit.patch"
diff --git a/main/make/fix-atexit-exit.patch b/main/make/fix-atexit-exit.patch
index 1507a2a3b0..a71d26fb55 100644
--- a/main/make/fix-atexit-exit.patch
+++ b/main/make/fix-atexit-exit.patch
@@ -4,15 +4,14 @@ 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.
---- make-4.0/output.c.orig 2013-10-06 02:12:24.000000000 +0300
-+++ make-4.0/output.c 2013-10-18 15:43:23.502563018 +0300
-@@ -515,7 +515,7 @@
- error (NILF, _("write error: %s"), strerror (errno));
+--- ./output.c.orig
++++ ./output.c
+@@ -495,7 +495,7 @@
+ perror_with_name (_("write error: stdout"), "");
else
- error (NILF, _("write error"));
-- exit (EXIT_FAILURE);
-+ _exit (EXIT_FAILURE);
+ O (error, NILF, _("write error: stdout"));
+- exit (MAKE_TROUBLE);
++ _exit (MAKE_TROUBLE);
}
}
-