diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-09-29 10:50:09 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-09-29 10:50:09 +0000 |
| commit | 46a7358a93aed937ef52092184446ff8a02351b1 (patch) | |
| tree | bc2c469969e61c766ac3152c8f29f64f140f2afd /main | |
| parent | 820d4a7b31f60208d825706850d12cfea071a107 (diff) | |
| download | aports-46a7358a93aed937ef52092184446ff8a02351b1.tar.bz2 aports-46a7358a93aed937ef52092184446ff8a02351b1.tar.xz | |
main/make: fix atexit handler (fixes test suite under musl)
Diffstat (limited to 'main')
| -rw-r--r-- | main/make/APKBUILD | 6 | ||||
| -rw-r--r-- | main/make/fix-atexit-exit.patch | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/main/make/APKBUILD b/main/make/APKBUILD index e6468dc314..43b448e5cb 100644 --- a/main/make/APKBUILD +++ b/main/make/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=make pkgver=3.82 -pkgrel=6 +pkgrel=7 pkgdesc="GNU make utility to maintain groups of programs" url="http://www.gnu.org/software/make" arch="all" @@ -17,6 +17,7 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.bz2 make-3.82-parallel-remake.patch make-3.82-dont-prune-intermediate.patch make-3.82-arg-list-length.patch + fix-atexit-exit.patch use-malloc.patch " @@ -60,6 +61,7 @@ f2ed48ea701e8ab6e5b870a3d125b71a make-3.82-expensive_glob.patch 89f8032d2f314eb6338739f024d8ecec make-3.82-parallel-remake.patch 97c9f064c4006c41f29d67febda858af make-3.82-dont-prune-intermediate.patch 1d175e00f931b7d866d2fddcf0c0b302 make-3.82-arg-list-length.patch +e81f80bec1a613299fb5aa8f244e620a fix-atexit-exit.patch c5b90dd539b5950ac2cf502f266c66aa use-malloc.patch" sha256sums="e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 make-3.82.tar.bz2 3860600de372c1f9f979f57170b14ae682847d6b9ecef24bb78d8a166e611338 make-3.82-savannah-bugs-30612-30723.patch @@ -70,6 +72,7 @@ df7775de5c97ecfe35df0c6abdf30d607484effbd2ebcee9d285c1c1c2b9935c make-3.82-expe 17d7749144be57e7bdec7e2d1bd8cc4f183350ff4271adf91cc3654e3b8c99ba make-3.82-parallel-remake.patch bba70ca6589f5afe8f1cf5b2f9cbec54fdbbf5685188ff0ebe5100034ee17b58 make-3.82-dont-prune-intermediate.patch 797cd4461687372e74881dd28059ad96fd2cdbf0f14c7aa3470019a8d8c1966f make-3.82-arg-list-length.patch +625ea26da3d85b4c705f7de38ce95637eb5e845cfd2713e76702e8f431ebe3de fix-atexit-exit.patch f3c6711071100e0e6f935a74dc60c05a66f77b011c13f2116853c3e5e6099187 use-malloc.patch" sha512sums="3260be0d1a9a7c5eb0dbb87179a9a9521fdfc7809ca51f13ee5a37ba5e63d21ad50a4249ec7d3929a9d0ce8c8f6cf302558743964f0f7ff742efe283b91df9de make-3.82.tar.bz2 3ce82573396ccdbe22f24b7bea1bd1b74b2dd902bf13cbfa501215f24b736674db78d35e637a9e1cc261471fc15eb5d6862c0e3d93197ec9905ac0b0949d09ac make-3.82-savannah-bugs-30612-30723.patch @@ -80,4 +83,5 @@ sha512sums="3260be0d1a9a7c5eb0dbb87179a9a9521fdfc7809ca51f13ee5a37ba5e63d21ad50a 89217ad37e77944cee4cb81b074bbdb8f047132cb7987c2af3c6b577b13bae079d0dcad548402bcf85865d890acabec4447dcaceb8f44c58cec2325bd59427d5 make-3.82-parallel-remake.patch 0e522677e8f62cca4aca26fbe22b1a5da5006a5459fe7b0a22c2d8ca358457ea8c0652eae052d3372967b631e68bdecdf0662e2219755b29e480766d0f0a23cd make-3.82-dont-prune-intermediate.patch b9623dd57116b2e660e004676338fb3c28557f0f1d4756b29b8b50eddb1beed4a7df7bd2bf1c9066c10110c2ff0331c012ade40bfd47b7ec4839ba94d6442d8a make-3.82-arg-list-length.patch +1031f252065325aa5bf66d9248a29b10d3f95ccfd8101de43a31b983411edf29f7b77bb5e4d7662a5d1dae8cd6b5f11d74676f4b8e4f010e676a6c8203216d51 fix-atexit-exit.patch e583971aae1569c04529db347e56eb84ec4cc9edf17e0b66999c595a211206939adf47bb3b72d66bb92b59159f59009f9a345dadcb9a2667639a2b901878e25d use-malloc.patch" diff --git a/main/make/fix-atexit-exit.patch b/main/make/fix-atexit-exit.patch new file mode 100644 index 0000000000..dd7cc25f79 --- /dev/null +++ b/main/make/fix-atexit-exit.patch @@ -0,0 +1,16 @@ +Author: Timo Teräs <timo.teras@iki.fi> + +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-3.82.orig/misc.c ++++ make-3.82/misc.c +@@ -954,6 +954,6 @@ + error (NILF, _("write error: %s"), strerror (errno)); + else + error (NILF, _("write error")); +- exit (EXIT_FAILURE); ++ _exit (EXIT_FAILURE); + } + } |