From ee3d554e34d61b3dac7fb9b6b3498ab2d23cac84 Mon Sep 17 00:00:00 2001
From: Jan Busa <busa@jinr.ru>
Date: Wed, 25 May 2022 19:13:03 +0300
Subject: [PATCH] Hopefully fixed c8 and c7 builds.
---
scripts/build.sh | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index 1fe00e5..4e1e4c8 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -41,14 +41,9 @@ if [[ $PACKAGE_VERSION == *-tmp ]];then
else
PACKAGE_VERSION=$(echo $PACKAGE_VERSION | rev | cut -d '-' -f2- | rev)
fi
- echo "FIRST OPENSSL"
- openssl version
source /etc/bashrc
git clone https://git.jinr.ru/nica/mpdroot.git --branch $PACKAGE_VERSION
source /cvmfs/nica.jinr.ru/sw/os/login.sh
- echo "SECOND OPENSSL"
- openssl version
- OLD_PATH=$PATH
module add mpddev
cd mpdroot
mkdir build
@@ -56,22 +51,9 @@ if [[ $PACKAGE_VERSION == *-tmp ]];then
export ALIBUILD_WORK_DIR="$ALIBUILD_BASE/sw"
export MPDROOT="$ALIBUILD_WORK_DIR/tmp/$NICADIST_ARCH/$PACKAGE_NAME/$PACKAGE_VERSION"
rm -rf $MPDROOT
-# cmake ..
-# make -j$NCORES install
- echo "BEFORE openssl"
- which openssl
- module list
- openssl version
+ cmake ..
+ make -j$NCORES install
module rm mpddev eigen3 FairRoot generators FairMQ asiofi protobuf CMake FairLogger ofi postgresql googletest Clang fmt pythia6 ZeroMQ asio simulation GEANT3 GEANT4_VMC vgm VMC ROOT XRootD libxml2 GSL pythia HepMC lhapdf boost Python-modules Python FreeType libffi sqlite AliEn-Runtime libpng zlib OpenSSL lzma GCC-Toolchain GEANT4 BASE
- echo "AFTER openssl"
- echo $PATH
- export PATH=$OLD_PATH # hack since module rm does not change the path
- echo "AFTER path"
- echo $PATH
- which openssl
- module list
- openssl version
- exit 1
else
echo "Package '$PACKAGE_NAME' is not supported !!!"
exit 1
--
GitLab