snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

boost: rebuild for Python 3.8. 

Also ensure bjam is called with the same parameters, to avoid
a full rebuild with -j1 in do_install.
This commit is contained in:
Leah Neukirchen 2019-10-19 18:34:00 +02:00
parent 94f9592195
commit 16069736c3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -688,7 +688,7 @@ libboost_stacktrace_noop.so.1.69.0 libboost_stacktrace_noop1.69-1.69.0_1<1.70.0
libboost_stacktrace_addr2line.so.1.69.0 libboost_stacktrace_addr2line1.69-1.69.0_1<1.70.0 libboost_stacktrace_addr2line.so.1.69.0 libboost_stacktrace_addr2line1.69-1.69.0_1<1.70.0
libboost_stacktrace_basic.so.1.69.0 libboost_stacktrace_basic1.69-1.69.0_1<1.70.0 libboost_stacktrace_basic.so.1.69.0 libboost_stacktrace_basic1.69-1.69.0_1<1.70.0
libboost_python27.so.1.69.0 boost-python1.69-1.69.0_1<1.70.0 libboost_python27.so.1.69.0 boost-python1.69-1.69.0_1<1.70.0
libboost_python36.so.1.69.0 boost-python3-1.69-1.69.0_1<1.70.0 libboost_python38.so.1.69.0 boost-python3-1.69-1.69.0_1<1.70.0
libexempi.so.8 exempi-2.5.0_1 libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1 libatasmart.so.4 libatasmart-0.17_1
libsgutils2.so.2 libsgutils-1.42_1 libsgutils2.so.2 libsgutils-1.42_1

13
srcpkgs/boost/template
View File

@ -1,7 +1,7 @@
# Template file for 'boost' # Template file for 'boost'
pkgname=boost pkgname=boost
version=1.69.0 version=1.69.0
revision=5 revision=6
wrksrc="${pkgname}_${version//\./_}" wrksrc="${pkgname}_${version//\./_}"
hostmakedepends="bzip2-devel icu-devel python-devel python3-devel" hostmakedepends="bzip2-devel icu-devel python-devel python3-devel"
makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel" makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
@ -60,9 +60,9 @@ do_build() {
using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}${py3_inc} : ${XBPS_CROSS_BASE}${py3_lib} ; using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}${py3_inc} : ${XBPS_CROSS_BASE}${py3_lib} ;
__EOF __EOF
./bjam ${makejobs} \ ./bjam ${makejobs} --prefix=${DESTDIR}/usr \
--toolset=${_toolset} abi=${_abi} architecture=${_arch} \ --toolset=${_toolset} abi=${_abi} architecture=${_arch} \
--user-config=${wrksrc}/user-config.jam --debug-building \ --user-config=${wrksrc}/user-config.jam \
python=2.7,${py3_ver} python=2.7,${py3_ver}
} }
do_install() { do_install() {
@ -72,9 +72,10 @@ do_install() {
done done
# Install headers/libs # Install headers/libs
./bjam --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \ ./bjam --prefix=${DESTDIR}/usr \
--user-config=${wrksrc}/user-config.jam python=2.7,${py3_ver} install --toolset=${_toolset} abi=${_abi} architecture=${_arch} \
--user-config=${wrksrc}/user-config.jam \
python=2.7,${py3_ver} install
# Install Boost.Build stuff. # Install Boost.Build stuff.
vmkdir usr/share/boost-build vmkdir usr/share/boost-build
cd ${wrksrc}/tools/build && cp -a . ${DESTDIR}/usr/share/boost-build cd ${wrksrc}/tools/build && cp -a . ${DESTDIR}/usr/share/boost-build