From 16069736c30e6388650907a2305d6425c67de3d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Oct 2019 18:34:00 +0200
Subject: [PATCH] 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.
---
 common/shlibs          |  2 +-
 srcpkgs/boost/template | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 651484ab438..d2dab1cd675 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -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_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_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
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2.so.2 libsgutils-1.42_1
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 40a4fe67730..a430e208f9e 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.69.0
-revision=5
+revision=6
 wrksrc="${pkgname}_${version//\./_}"
 hostmakedepends="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} ;
 
 	__EOF
-	./bjam ${makejobs} \
+	./bjam ${makejobs} --prefix=${DESTDIR}/usr \
 		--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}
 }
 do_install() {
@@ -72,9 +72,10 @@ do_install() {
 	done
 
 	# Install headers/libs
-	./bjam --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
-		--user-config=${wrksrc}/user-config.jam python=2.7,${py3_ver} install
-
+	./bjam --prefix=${DESTDIR}/usr \
+		--toolset=${_toolset} abi=${_abi} architecture=${_arch} \
+		--user-config=${wrksrc}/user-config.jam \
+		python=2.7,${py3_ver} install
 	# Install Boost.Build stuff.
 	vmkdir usr/share/boost-build
 	cd ${wrksrc}/tools/build && cp -a . ${DESTDIR}/usr/share/boost-build