diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-13 07:04:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-13 10:34:23 +0000 |
| commit | 94e88d0c74925a356eb452182b2c5f5cde9d3fba (patch) | |
| tree | 47ef6d716082df1b13f8559a1b71f264ebbee1f0 /main/boost | |
| parent | 75f8b53d53138650460b9aeb777966cc45b1e882 (diff) | |
| download | aports-94e88d0c74925a356eb452182b2c5f5cde9d3fba.tar.bz2 aports-94e88d0c74925a356eb452182b2c5f5cde9d3fba.tar.xz | |
main/boost: revert WIFSIGNALED static assert
http://www.openwall.com/lists/musl/2018/08/10/3
Diffstat (limited to 'main/boost')
| -rw-r--r-- | main/boost/APKBUILD | 6 | ||||
| -rw-r--r-- | main/boost/revert-wifsignaled-static-assert.patch | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD index 1046e4e00d..7a15c23d99 100644 --- a/main/boost/APKBUILD +++ b/main/boost/APKBUILD @@ -2,7 +2,7 @@ pkgname=boost pkgver=1.67.0 _pkgver="${pkgver//./_}" -pkgrel=0 +pkgrel=1 pkgdesc="Free peer-reviewed portable C++ source libraries" url="http://www.boost.org/" arch="all" @@ -14,6 +14,7 @@ subpackages="$pkgname-static $pkgname-dev $pkgname-doc" source="https://dl.bintray.com/boostorg/release/$pkgver/source/${pkgname}_$_pkgver.tar.bz2 boost-1.57.0-python-abi_letters.patch boost-1.57.0-python-libpython_dep.patch + revert-wifsignaled-static-assert.patch " options="!checkroot" builddir="$srcdir/${pkgname}_${_pkgver}" @@ -174,4 +175,5 @@ _pyversion() { sha512sums="82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8 boost_1_67_0.tar.bz2 d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch -132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch" +132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch +1cae6ab9b3b97e0328aa5b85ee2220bb1e88b99256b31bc4a2d06275cf70704c8f4f1bd6abd77386d0490bb14a0393ae981be8e95f2cc054a1dc07de8847e8d5 revert-wifsignaled-static-assert.patch" diff --git a/main/boost/revert-wifsignaled-static-assert.patch b/main/boost/revert-wifsignaled-static-assert.patch new file mode 100644 index 0000000000..cba4ec8aca --- /dev/null +++ b/main/boost/revert-wifsignaled-static-assert.patch @@ -0,0 +1,15 @@ +http://www.openwall.com/lists/musl/2018/08/10/3 + +diff --git a/boost/process/detail/posix/is_running.hpp b/boost/process/detail/posix/is_running.hpp +index 0d431a9..342be7d 100644 +--- a/boost/process/detail/posix/is_running.hpp ++++ b/boost/process/detail/posix/is_running.hpp +@@ -17,7 +17,7 @@ namespace boost { namespace process { namespace detail { namespace posix { + // This bit arrangement of status codes is not guaranteed by POSIX, but (according to comments in + // the glibc <bits/waitstatus.h> header) is the same across systems in practice. + constexpr int still_active = 0x7F; +-static_assert(!WIFEXITED(still_active) && !WIFSIGNALED(still_active), "Internal Error"); ++static_assert(!WIFEXITED(still_active), "Internal Error"); + + inline bool is_running(int code) + { |