diff options
author | tcely <tcely@users.noreply.github.com> | 2018-07-23 03:37:10 -0400 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-13 10:34:23 +0000 |
commit | 3a8f4f01ce3810d2a6e1338fe658c75925c8883f (patch) | |
tree | 4fb650aa311de57bdce40a4ffc318b78b3d2b3dc /main/boost | |
parent | 40b1305ed69e28673952a5dccc7460cc3d671680 (diff) | |
download | alpine_aports-3a8f4f01ce3810d2a6e1338fe658c75925c8883f.tar.bz2 alpine_aports-3a8f4f01ce3810d2a6e1338fe658c75925c8883f.tar.xz alpine_aports-3a8f4f01ce3810d2a6e1338fe658c75925c8883f.zip |
main/boost: upgrade to 1.67.0
Diffstat (limited to 'main/boost')
-rw-r--r-- | main/boost/APKBUILD | 135 | ||||
-rw-r--r-- | main/boost/dual-python.patch | 27 |
2 files changed, 84 insertions, 78 deletions
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD index e8a5c3139e..1046e4e00d 100644 --- a/main/boost/APKBUILD +++ b/main/boost/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=boost | 2 | pkgname=boost |
3 | pkgver=1.66.0 | 3 | pkgver=1.67.0 |
4 | _pkgver="${pkgver//./_}" | 4 | _pkgver="${pkgver//./_}" |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="Free peer-reviewed portable C++ source libraries" | 6 | pkgdesc="Free peer-reviewed portable C++ source libraries" |
@@ -10,15 +10,36 @@ license="custom" | |||
10 | depends="" | 10 | depends="" |
11 | depends_dev="linux-headers" | 11 | depends_dev="linux-headers" |
12 | makedepends="$depends_dev python2-dev>=2.6 python3-dev flex bison bzip2-dev zlib-dev" | 12 | makedepends="$depends_dev python2-dev>=2.6 python3-dev flex bison bzip2-dev zlib-dev" |
13 | subpackages="$pkgname-dev $pkgname-doc" | 13 | subpackages="$pkgname-static $pkgname-dev $pkgname-doc" |
14 | source="https://dl.bintray.com/boostorg/release/$pkgver/source/${pkgname}_$_pkgver.tar.bz2 | 14 | source="https://dl.bintray.com/boostorg/release/$pkgver/source/${pkgname}_$_pkgver.tar.bz2 |
15 | boost-1.57.0-python-abi_letters.patch | 15 | boost-1.57.0-python-abi_letters.patch |
16 | boost-1.57.0-python-libpython_dep.patch | 16 | boost-1.57.0-python-libpython_dep.patch |
17 | dual-python.patch | ||
18 | " | 17 | " |
18 | options="!checkroot" | ||
19 | builddir="$srcdir/${pkgname}_${_pkgver}" | 19 | builddir="$srcdir/${pkgname}_${_pkgver}" |
20 | 20 | ||
21 | _libs="date_time | 21 | case "$CARCH" in |
22 | armhf|aarch64) _boostarch=arm ;; | ||
23 | ppc64*) _boostarch=ppc ;; | ||
24 | s390x) | ||
25 | _boostarch=s390 | ||
26 | _l_suffix=390 | ||
27 | _options_carch="--without-context --without-coroutine" | ||
28 | ;; | ||
29 | *) _boostarch=$CARCH ;; | ||
30 | esac | ||
31 | _enginedir="tools/build/src/engine" | ||
32 | _bjam="${builddir}/${_enginedir}/bin.linux${_l_suffix:-$_boostarch}/b2" | ||
33 | |||
34 | _libs=" | ||
35 | atomic | ||
36 | chrono | ||
37 | container | ||
38 | context | ||
39 | contract | ||
40 | coroutine | ||
41 | date_time | ||
42 | fiber | ||
22 | filesystem | 43 | filesystem |
23 | graph | 44 | graph |
24 | iostreams | 45 | iostreams |
@@ -38,89 +59,101 @@ _libs="date_time | |||
38 | wserialization | 59 | wserialization |
39 | " | 60 | " |
40 | for _lib in $_libs; do | 61 | for _lib in $_libs; do |
62 | case "$_options_carch" in | ||
63 | *$_lib*) continue;; | ||
64 | esac | ||
41 | subpackages="$subpackages $pkgname-$_lib:_boostlib" | 65 | subpackages="$subpackages $pkgname-$_lib:_boostlib" |
42 | done | 66 | done |
43 | 67 | ||
68 | _set_options() { | ||
69 | [ -n "$PY2_VERSION" ] || PY2_VERSION="$(_pyversion python2)" | ||
70 | [ -n "$PY3_VERSION" ] || PY3_VERSION="$(_pyversion python3)" | ||
71 | |||
72 | local _options_python="${PY2_VERSION:+$PY2_VERSION,}${PY3_VERSION}" | ||
73 | [ -z "$_options_python" ] || _options_python="python=$_options_python" | ||
74 | |||
75 | _options=" | ||
76 | --user-config=\"$builddir/user-config.jam\" | ||
77 | --prefix=\"$pkgdir/usr\" | ||
78 | release | ||
79 | $_options_python | ||
80 | toolset=gcc | ||
81 | debug-symbols=off | ||
82 | threading=single,multi | ||
83 | runtime-link=shared | ||
84 | link=shared,static | ||
85 | cflags=-fno-strict-aliasing | ||
86 | --layout=tagged | ||
87 | -q | ||
88 | -j${JOBS:-2} | ||
89 | $_options_carch | ||
90 | " | ||
91 | } | ||
92 | |||
44 | prepare() { | 93 | prepare() { |
45 | default_prepare || return 1 | 94 | default_prepare |
46 | 95 | ||
47 | cd "$builddir" | 96 | cd "$builddir" |
48 | 97 | _set_options | |
49 | PY2_VERSION="$(_pyversion python2)" | 98 | local abiflags="$(python3-config --abiflags)" |
50 | PY3_VERSION="$(_pyversion python3)" | ||
51 | abiflags=$(python3-config --abiflags) | ||
52 | |||
53 | 99 | ||
54 | # create user-config.jam | 100 | # create user-config.jam |
55 | cat > user-config.jam <<-__EOF__ | 101 | cat > user-config.jam <<-__EOF__ |
56 | 102 | ||
57 | using gcc : : $CC : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; | 103 | using gcc : : $CC : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; |
58 | using python : ${PY2_VERSION} : /usr/bin/python2 : /usr/include/python${PY2_VERSION} : : : : ; | 104 | using python : ${PY2_VERSION:+$PY2_VERSION }: /usr/bin/python2 : ${PY2_VERSION:+/usr/include/python${PY2_VERSION} }: : : : ; |
59 | using python : ${PY3_VERSION} : /usr/bin/python3 : /usr/include/python${PY3_VERSION}m : : : : $abiflags ; | 105 | using python : ${PY3_VERSION:+$PY3_VERSION }: /usr/bin/python3 : ${PY3_VERSION:+/usr/include/python${PY3_VERSION}${abiflags} }: : : : ${abiflags:+$abiflags }; |
60 | 106 | ||
61 | __EOF__ | 107 | __EOF__ |
62 | } | 108 | } |
63 | 109 | ||
64 | case "$CARCH" in | ||
65 | armhf|aarch64) _boostarch=arm ;; | ||
66 | ppc64*) _boostarch=ppc ;; | ||
67 | s390x) _boostarch=s390 ;; | ||
68 | *) _boostarch=$CARCH ;; | ||
69 | esac | ||
70 | _enginedir=tools/build/src/engine | ||
71 | _bjam="${builddir}/$_enginedir/bin.linux${_boostarch}/bjam" | ||
72 | [ "$_boostarch" = "s390" ] && _bjam="${builddir}/$_enginedir/bin.linux390/bjam" && \ | ||
73 | _options_s390="--without-context --without-coroutine" | ||
74 | |||
75 | _options="--user-config=\"$builddir/user-config.jam\" | ||
76 | --prefix=\"$pkgdir/usr\" | ||
77 | release | ||
78 | debug-symbols=off | ||
79 | threading=single,multi | ||
80 | runtime-link=shared | ||
81 | link=shared,static | ||
82 | cflags=-fno-strict-aliasing | ||
83 | -sPYTHON_ROOT=/usr | ||
84 | -sPYTHON_VERSION=$PY2_VERSION | ||
85 | -sTOOLS=gcc | ||
86 | --layout=tagged | ||
87 | -q | ||
88 | -j${JOBS:-2} | ||
89 | ${_options_s390} | ||
90 | " | ||
91 | |||
92 | build() { | 110 | build() { |
93 | export BOOST_ROOT="$builddir" | 111 | export BOOST_ROOT="$builddir" |
94 | 112 | ||
95 | msg "Building bjam" | 113 | msg "Building bjam" |
96 | cd "$builddir"/$_enginedir | 114 | cd "$builddir"/$_enginedir |
97 | CC= ./build.sh cc || return 1 | 115 | CC= ./build.sh cc |
98 | 116 | ||
99 | msg "Building bcp" | 117 | msg "Building bcp" |
100 | cd "$builddir"/tools/bcp | 118 | cd "$builddir"/tools/bcp |
101 | "$_bjam" -j${JOBS:-2} || return 1 | 119 | "$_bjam" -j${JOBS:-2} |
102 | 120 | ||
103 | msg "Building boost" | 121 | msg "Building boost" |
104 | cd "$builddir" | 122 | cd "$builddir" |
123 | _set_options | ||
105 | "$_bjam" $_options | 124 | "$_bjam" $_options |
106 | } | 125 | } |
107 | 126 | ||
127 | check() { | ||
128 | cd "$builddir"/tools/build/test | ||
129 | |||
130 | PATH="${_bjam%/*}:${PATH}" python2 test_all.py --default-bjam | ||
131 | } | ||
132 | |||
108 | package() { | 133 | package() { |
109 | export BOOST_ROOT="$builddir" | 134 | export BOOST_ROOT="$builddir" |
110 | cd "$builddir" | 135 | cd "$builddir" |
136 | _set_options | ||
111 | 137 | ||
112 | install -Dm755 $_bjam \ | 138 | install -Dm755 "$_bjam" \ |
113 | "$pkgdir"/usr/bin/bjam || return 1 | 139 | "$pkgdir"/usr/bin/b2 |
140 | ln -s b2 "$pkgdir"/usr/bin/bjam # old name for b2 binary | ||
114 | 141 | ||
115 | install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp || return 1 | 142 | install -Dm755 dist/bin/bcp "$pkgdir"/usr/bin/bcp |
116 | 143 | ||
117 | install -Dm644 LICENSE_1_0.txt \ | 144 | install -Dm644 LICENSE_1_0.txt \ |
118 | "$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt || return 1 | 145 | "$pkgdir"/usr/share/licenses/$pkgname/LICENSE_1_0.txt |
119 | 146 | ||
120 | "$pkgdir"/usr/bin/bjam $_options \ | 147 | "$pkgdir"/usr/bin/bjam $_options \ |
121 | --includedir="$pkgdir"/usr/include \ | 148 | --includedir="$pkgdir"/usr/include \ |
122 | --libdir="$pkgdir"/usr/lib \ | 149 | --libdir="$pkgdir"/usr/lib \ |
123 | install || return 1 | 150 | install |
151 | } | ||
152 | |||
153 | static() { | ||
154 | pkgdesc="Static libraries for boost" | ||
155 | mkdir -p "$subpkgdir"/usr/lib | ||
156 | mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/ | ||
124 | } | 157 | } |
125 | 158 | ||
126 | _boostlib() { | 159 | _boostlib() { |
@@ -132,13 +165,13 @@ _boostlib() { | |||
132 | 165 | ||
133 | mkdir -p "$subpkgdir"/usr/lib | 166 | mkdir -p "$subpkgdir"/usr/lib |
134 | mv "$pkgdir"/usr/lib/libboost_$name* "$subpkgdir"/usr/lib/ | 167 | mv "$pkgdir"/usr/lib/libboost_$name* "$subpkgdir"/usr/lib/ |
168 | rmdir "$pkgdir"/usr/lib >/dev/null 2>&1 || : | ||
135 | } | 169 | } |
136 | 170 | ||
137 | _pyversion() { | 171 | _pyversion() { |
138 | $1 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))' | 172 | "$(command -v "$1")" -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))' |
139 | } | 173 | } |
140 | 174 | ||
141 | sha512sums="0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b boost_1_66_0.tar.bz2 | 175 | sha512sums="82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8 boost_1_67_0.tar.bz2 |
142 | d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch | 176 | d96d4d37394a31764ed817d0bc4a99cffa68a75ff1ecfd4417b9e1e5ae2c31a96ed24f948c6f2758ffdac01328d2402c4cf0d33a37107e4f5f721e636daebd66 boost-1.57.0-python-abi_letters.patch |
143 | 132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch | 177 | 132c4b62815d605c2d3c9038427fa4f422612a33711d47b2862f2311516af8a371d6b75bf078a7bffe20be863f8d21fb9fe74dc1a1bac3a10d061e9768ec3e02 boost-1.57.0-python-libpython_dep.patch" |
144 | de0d59b19f0a16a747b66833d399c62fa50a1f8baa68bd98195cc718d220ca98219a8a4b083c1962054a5d0299d0afdd83c0d2b54d8d457e37c34a9c05591265 dual-python.patch" | ||
diff --git a/main/boost/dual-python.patch b/main/boost/dual-python.patch deleted file mode 100644 index 6a06478889..0000000000 --- a/main/boost/dual-python.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | diff --git a/tools/build/src/tools/python.jam b/tools/build/src/tools/python.jam | ||
2 | index cbd6419..0c29df6 100644 | ||
3 | --- a/tools/build/src/tools/python.jam | ||
4 | +++ b/tools/build/src/tools/python.jam | ||
5 | @@ -907,14 +907,14 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : | ||
6 | # for a particular target OS as the default. This makes it so that we can | ||
7 | # select a python interpreter with only knowledge of the target OS. And hence | ||
8 | # can configure different Pythons based on the target OS only. | ||
9 | - local toolset-requirements = [ toolset.requirements ] ; | ||
10 | - local toolset-target-os-requirements | ||
11 | - = [ property.evaluate-conditionals-in-context | ||
12 | - [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ; | ||
13 | - if ! <python> in $(toolset-target-os-requirements:G) | ||
14 | - { | ||
15 | - toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ; | ||
16 | - } | ||
17 | +# local toolset-requirements = [ toolset.requirements ] ; | ||
18 | +# local toolset-target-os-requirements | ||
19 | +# = [ property.evaluate-conditionals-in-context | ||
20 | +# [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ; | ||
21 | +# if ! <python> in $(toolset-target-os-requirements:G) | ||
22 | +# { | ||
23 | +# toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ; | ||
24 | +# } | ||
25 | |||
26 | # Register the right suffix for extensions. | ||
27 | register-extension-suffix $(extension-suffix) : $(target-requirements) ; | ||