Commit 2537c681 authored by incardon's avatar incardon
Browse files

Reinstalling BOOST

parent 8f137017
Pipeline #3861 passed with stages
in 29 minutes and 56 seconds
...@@ -23,6 +23,7 @@ fi ...@@ -23,6 +23,7 @@ fi
if [ x"$hostname" == x"cifarm-mac-node.mpi-cbg.de" ]; then if [ x"$hostname" == x"cifarm-mac-node.mpi-cbg.de" ]; then
echo "Mac node" echo "Mac node"
export PATH="$HOME/openfpm_dependencies/openfpm_data/CMAKE/bin:$PATH" export PATH="$HOME/openfpm_dependencies/openfpm_data/CMAKE/bin:$PATH"
rm -rf $HOME/openfpm_dependencies/openfpm_data/BOOST
fi fi
# Check if libHilbert is installed # Check if libHilbert is installed
......
...@@ -12,7 +12,7 @@ fi ...@@ -12,7 +12,7 @@ fi
rm boost_1_75_0.tar.bz2 rm boost_1_75_0.tar.bz2
wget http://ppmcore.mpi-cbg.de/upload/boost_1_75_0.tar.bz2 wget http://ppmcore.mpi-cbg.de/upload/boost_1_75_0.tar.bz2
tar -xvf boost_1_75_0.tar.bz2 tar -xf boost_1_75_0.tar.bz2
cd boost_1_75_0 cd boost_1_75_0
if [ x"$4" != x"" ]; then if [ x"$4" != x"" ]; then
if [ -f $HOME/user-config.jam ]; then if [ -f $HOME/user-config.jam ]; then
...@@ -30,15 +30,15 @@ mkdir $1/BOOST ...@@ -30,15 +30,15 @@ mkdir $1/BOOST
if [ x"$platform" == x"osx" ]; then if [ x"$platform" == x"osx" ]; then
if [ x"$arch" == x"arm64" ]; then if [ x"$arch" == x"arm64" ]; then
if [ x"$3" == x"" ]; then if [ x"$3" == x"" ]; then
./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=clang ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=clang -sNO_LZMA=1 -sNO_ZSTD=1
else else
./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=$3 ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=arm abi=aapcs binary-format=mach-o toolset=$3 -sNO_LZMA=1 -sNO_ZSTD=1
fi fi
else else
./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=x86 abi=sysv binary-format=mach-o toolset=clang ./b2 -j $2 install --prefix=$1/BOOST address-model=64 architecture=x86 abi=sysv binary-format=mach-o toolset=clang -sNO_LZMA=1 -sNO_ZSTD=1
fi fi
else else
./b2 -j $2 install --prefix=$1/BOOST ./b2 -j $2 install --prefix=$1/BOOST -sNO_LZMA=1 -sNO_ZSTD=1
fi fi
rm -rf boost_1_75_0 rm -rf boost_1_75_0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment