From ab886edd5fb067fd503758d3da16c959adb13ddf Mon Sep 17 00:00:00 2001 From: "Dr. Thomas Orgis" <thomas.orgis@uni-hamburg.de> Date: Thu, 26 Mar 2020 15:46:10 +0100 Subject: [PATCH] lsmtool und Beginn ohne LDFLAGS --- build_lofar_cepH.sh | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/build_lofar_cepH.sh b/build_lofar_cepH.sh index cb25f43..968983d 100644 --- a/build_lofar_cepH.sh +++ b/build_lofar_cepH.sh @@ -34,7 +34,7 @@ export CXXFLAGS="-D_GLIB_USE_CXX_ABI=1 -DBOOST_NO_CXX11_SCOPED_ENUMS -march=nati # Trying to ensure openblas_openmp here, but that needs to be fixed # in the packages, recognizing that a dependency is already using # openblas and then not trying to use a different one:-/ -export LDFLAGS="-lgsl -lcblas -lopenblas_openmp -Wl,--as-needed" +#export LDFLAGS="-lgsl -lcblas -lopenblas_openmp -Wl,--as-needed" # Ensure that we know what include search path variable is really used. # Only leave CPATH set. @@ -490,20 +490,31 @@ else echo pyBDSF already installed. fi || exit 1 -exit # Did not get to lsmtool yet. - -if [ ! -d $INSTALLDIR/lsmtool ]; then +prefix=$INSTALLDIR/lsmtool && +lsmlib=$prefix/lib/python$PYTHON_VERSION/site-packages && +export PYTHONPATH=$lsmlib:$PYTHONPATH && +if [ ! -e $prefix/.done ]; then echo Installing LSMTool. # # Install LSMTool. # - mkdir -p $INSTALLDIR/lsmtool/lib/python$PYTHON_VERSION/site-packages - export PYTHONPATH=$INSTALLDIR/lsmtool/lib/python$PYTHON_VERSION/site-packages:$PYTHONPATH - cd $INSTALLDIR/lsmtool && git clone https://github.com/darafferty/LSMTool.git lsmtool - cd $INSTALLDIR/lsmtool/lsmtool && python setup.py install --prefix=$INSTALLDIR/lsmtool + mkdir -p $prefix && + cd $prefix && + rm -rf build bin lib presrc && + if test -e src; then + echo "Using existing sources." + else + git clone https://github.com/darafferty/LSMTool.git presrc && + mv presrc src + fi && + mkdir -p $lsmlib && + cd src && + python setup.py install --prefix=$prefix && + echo "Done with LSMTool." && + touch $prefix/.done else echo LSMTool already installed. -fi +fi || exit 1 ############################### # Finish up the installation. # -- GitLab