From 0eff95b244acc154ebc031e84b21411270b93772 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Thu, 16 Jul 2020 11:42:57 +0200
Subject: [PATCH] boost/1.73 build, without Python

---
 Compiler/boost/build                | 60 ++++++++++++++---------------
 Compiler/boost/files/variants       | 39 -------------------
 Compiler/boost/files/variants.rhel6 | 25 ++++++++++++
 3 files changed, 55 insertions(+), 69 deletions(-)
 delete mode 100644 Compiler/boost/files/variants
 create mode 100644 Compiler/boost/files/variants.rhel6

diff --git a/Compiler/boost/build b/Compiler/boost/build
index e836e3d..5b2d34b 100755
--- a/Compiler/boost/build
+++ b/Compiler/boost/build
@@ -1,44 +1,44 @@
 #!/usr/bin/env modbuild
+pbuild::set_download_url "https://netcologne.dl.sourceforge.net/project/${P}/${P}/$V/${P}_${V_PKG//./_}.tar.gz"
+#pbuild::set_download_url "https://dl.bintray.com/boostorg/release/${V_PKG}/source/${P}_${V_PKG//./_}.tar.gz"
 
-#pbuild::set_download_url "https://netcologne.dl.sourceforge.net/project/$P/$P/$V/$P_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
-pbuild::set_download_url "https://dl.bintray.com/boostorg/release/${V_PKG}/source/${P}_${V_PKG//./_}.tar.gz"
 pbuild::add_to_group 'Compiler'
 
 BOOST_BUILD_PATH="${BUILD_DIR}"
 
-pbuild::configure() {
-	cd "${SRC_DIR}"
-	"${SRC_DIR}"/bootstrap.sh \
-		--prefix="${PREFIX}" \
-		--with-libraries=all \
-		--with-python-root="${PYTHON_PREFIX}" \
-		|| exit 1
+TOOLSET=''
+
+pbuild::pre_configure() {
+	case "${COMPILER}" in
+	gcc )
+	        TOOLSET=gcc
+	        ;;
+	* )
+	        std::die 1 "Unsupported compiler!"
+	        ;;
+	esac
 }
 
 pbuild::compile() {
-	cd "${SRC_DIR}"
-	./b2 \
-		--build-type=minimal \
-		--build-dir="${BUILD_DIR}" \
-		--layout=system \
+        cd "${SRC_DIR}"
+        ./bootstrap.sh \
+                --prefix="${PREFIX}" \
+                --with-toolset=${TOOLSET} \
+                --without-libraries=python \
+                || exit 1
+        ./b2  \
+                --build-dir="${BUILD_DIR}" \
+                --layout=system \
+                --without-python \
 		--without-mpi \
-		variant=release \
-		link=shared,static \
-		threading=multi \
-		stage
+                toolset=${TOOLSET} \
+                variant=release \
+                link=shared,static \
+                threading=multi \
+                install -j 3 \
+                || exit 1
 }
 
 pbuild::install() {
-	cd "${SRC_DIR}"
-	./b2 \
-		--build-type=minimal \
-		--build-dir="${BUILD_DIR}" \
-		--layout=system \
-		--without-mpi \
-		variant=release \
-		link=shared,static \
-		threading=multi \
-		install
+	:
 }
-
-
diff --git a/Compiler/boost/files/variants b/Compiler/boost/files/variants
deleted file mode 100644
index d20237b..0000000
--- a/Compiler/boost/files/variants
+++ /dev/null
@@ -1,39 +0,0 @@
-boost/1.55.0         stable     gcc/4.7.4 b:Python/3.4.0 
-boost/1.55.0         stable     gcc/4.8.3 b:Python/3.4.0 
-boost/1.55.0         stable     gcc/4.8.4 b:Python/3.4.0 
-boost/1.55.0         stable     gcc/4.8.5 b:Python/2.7.11
-boost/1.55.0         stable     gcc/4.9.2 b:Python/3.4.0 
-
-boost/1.57.0         stable     gcc/4.8.2 b:Python/3.4.0 
-
-boost/1.58.0         stable	gcc/4.8.4 b:Python/3.4.0 
-boost/1.58.0         stable	gcc/4.8.5 b:Python/2.7.11 
-boost/1.58.0         stable	gcc/4.9.3 b:Python/2.7.11
-boost/1.58.0         stable     gcc/6.3.0 b:Python/2.7.12
-
-boost/1.61.0         stable	gcc/4.8.5 b:Python/2.7.11 
-boost/1.61.0         stable	gcc/6.2.0 b:Python/2.7.11 
-
-boost/1.62.0         stable	gcc/4.8.5 Python/2.7.12 
-boost/1.62.0         stable	gcc/4.9.4 Python/2.7.12 
-boost/1.62.0         stable	gcc/5.4.0 Python/2.7.12 
-boost/1.62.0         stable	gcc/6.2.0 Python/2.7.12 
-boost/1.62.0         stable	gcc/6.3.0 Python/2.7.12 
-boost/1.62.0         stable	gcc/7.1.0 Python/2.7.12 
-boost/1.63.0         stable     gcc/6.3.0 Python/2.7.12
-boost/1.64.0         stable	gcc/5.4.0 Python/2.7.12
-
-boost/1.66.0         stable	gcc/5.5.0 b:Python/2.7.12
-boost/1.66.0         stable	gcc/6.4.0 b:Python/2.7.12
-boost/1.66.0         stable	gcc/7.3.0 b:Python/2.7.12
-boost/1.66.0         stable	clang-macos/9.0.0 b:Python/2.7.12
-boost/1.66.0         stable	intel/17.4 b:Python/2.7.12
-
-boost/1.67.0         stable	gcc/5.5.0 b:Python/2.7.14
-boost/1.67.0         stable	gcc/6.4.0 b:Python/2.7.14
-boost/1.67.0         stable	gcc/7.3.0 b:Python/2.7.14
-boost/1.67.0         stable	clang-macos/9.0.0 b:Python/2.7.14
-boost/1.67.0         stable	intel/17.4 b:Python/2.7.14
-
-boost/1.68.0         stable	gcc/7.3.0 b:Python/2.7.14
-boost/1.68.0         stable	gcc/8.2.0 b:Python/2.7.14
diff --git a/Compiler/boost/files/variants.rhel6 b/Compiler/boost/files/variants.rhel6
new file mode 100644
index 0000000..51cd332
--- /dev/null
+++ b/Compiler/boost/files/variants.rhel6
@@ -0,0 +1,25 @@
+boost/1.55.0	deprecated	gcc/{4.7.4,4.8.3,4.8.4,4.9.2} b:Python/3.4.0 
+boost/1.55.0    deprecated	gcc/4.8.5 b:Python/2.7.11
+
+boost/1.57.0    deprecated	gcc/4.8.2 b:Python/3.4.0 
+
+boost/1.58.0	deprecated	gcc/4.8.4 b:Python/3.4.0 
+boost/1.58.0    deprecated	gcc/{4.8.5,4.9.3} b:Python/2.7.11 
+
+boost/1.61.0	deprecated	gcc/{4.8.5,6.2.0} b:Python/2.7.11 
+
+boost/1.62.0	deprecated	gcc/{4.8.5,4.9.4,5.4.0,6.2.0,6.3.0,7.1.0} Python/2.7.12 
+
+boost/1.63.0	deprecated	gcc/6.3.0 Python/2.7.12
+
+boost/1.64.0	deprecated	gcc/5.4.0 Python/2.7.12
+
+boost/1.66.0	stable		gcc/{5.5.0,6.4.0,7.3.0} b:Python/2.7.14
+boost/1.66.0	stable		intel/17.4 b:Python/2.7.12
+
+boost/1.67.0	stable		gcc/{5.5.0,6.4.0,7.3.0} b:Python/2.7.14
+boost/1.67.0	stable		intel/17.4 b:Python/2.7.14
+
+boost/1.68.0	stable		gcc/{7.3.0,8.2.0} b:Python/2.7.14
+
+boost/1.73.0	unstable	gcc/{7.5.0,8.4.0,9.3.0,10.1.0} b:zlib/1.2.11