From 448efc02132f8f404f5995d6086ce7fe13715fa0 Mon Sep 17 00:00:00 2001
From: Incardona Pietro <incardon@mpi-cbg.de>
Date: Sun, 14 Nov 2021 17:05:25 +0100
Subject: [PATCH] Fixing installation of BOOST
---
build.sh | 5 -----
install_BOOST.sh | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/build.sh b/build.sh
index d5c0beb..2fe9846 100755
--- a/build.sh
+++ b/build.sh
@@ -10,8 +10,6 @@ if [ x"$hostname" == x"cifarm-centos-node.mpi-cbg.de" ]; then
echo "CentOS node"
source /opt/rh/devtoolset-8/enable
export PATH="$HOME/openfpm_dependencies/openfpm_pdata/$branch/CMAKE/bin:$PATH"
- echo "$PATH"
- cmake --version
fi
if [ x"$hostname" == x"cifarm-ubuntu-node" ]; then
@@ -21,8 +19,6 @@ fi
mkdir src/config
-#rm -rf $HOME/openfpm_dependencies/openfpm_devices/BOOST
-echo "$hostname"
if [ ! -d $HOME/openfpm_dependencies/openfpm_devices/BOOST ]; then
if [ x"$hostname" == x"cifarm-mac-node" ]; then
@@ -40,4 +36,3 @@ sh ./configure --with-boost=$HOME/openfpm_dependencies/openfpm_devices/BOOST --e
make VERBOSE=1
-
diff --git a/install_BOOST.sh b/install_BOOST.sh
index f6069a5..d080b34 100755
--- a/install_BOOST.sh
+++ b/install_BOOST.sh
@@ -35,7 +35,7 @@ if [ x"$platform" == x"osx" ]; then
./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=$3
fi
else
- ./b2 -j $2 install --prefix=$1/BOOST
+ ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=x86 abi=sysv binary-format=mach-o toolset=clang
fi
else
./b2 -j $2 install --prefix=$1/BOOST
--
GitLab