merge from master

[tools/sat_salome.git] / products / compil_scripts / openturns-1.18.sh

diff --git a/products/compil_scripts/openturns-1.18.sh b/products/compil_scripts/openturns-1.18.sh
index 78da8e150a246d87955720b767fde11a49f0b759..ada4b7860b3463e0c995d75d1e0ea648b45a06fe 100755 (executable)
--- a/products/compil_scripts/openturns-1.18.sh
+++ b/products/compil_scripts/openturns-1.18.sh
@@ -5,10 +5,11 @@ echo "openturns" $VERSION
 echo "##########################################################################"
 
 # we don't install in python directory -> modify environment as described in INSTALL file
-mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION:0:3}/site-packages
+
+mkdir -p $PRODUCT_INSTALL/lib/python${PYTHON_VERSION}/site-packages
 export PATH=$(pwd)/bin:$PATH
 export PYTHONPATH=$(pwd):$PYTHONPATH
-export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
+export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$PYTHONPATH
 
 CMAKE_OPTIONS=""
 if [ -n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
@@ -18,6 +19,7 @@ if [ -n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
 fi
 
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
+CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
 
@@ -29,6 +31,17 @@ if [ -n "$TBB_ROOT_DIR" ] && [ "$SAT_tbb_IS_NATIVE" != "1" ]; then
     CMAKE_OPTIONS+=" -DTBB_ROOT_DIR=${TBB_ROOT_DIR}"
 fi
 
+# https://github.com/persalys/persalys/issues/745
+LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+case $LINUX_DISTRIBUTION in
+    UB22*|CO8*|CO9*|FD36)
+       echo "WARNING: switching OFF TBB support"
+       CMAKE_OPTIONS+=" -DUSE_TBB=OFF"
+       ;;
+    *)
+       ;;
+esac
+
 # Blas/Lapack
 if [ -n "$LAPACK_ROOT_DIR" ] && [ "$SAT_lapack_IS_NATIVE" != "1" ]; then
     CMAKE_OPTIONS+=" -DLAPACK_DIR=${LAPACK_ROOT_DIR}/lib/cmake/lapack-3.8.0"
@@ -93,6 +106,7 @@ if [ -n "$NLOPT_ROOT_DIR" ] && [ "$SAT_nlopt_IS_NATIVE" != "1" ]; then
 fi
 
 
+
 echo
 echo "*** cmake" $CMAKE_OPTIONS
 
@@ -136,7 +150,7 @@ fi
 export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:${PYTHONPATH}
 export LD_LIBRARY_PATH=${PRODUCT_INSTALL}/lib:${LD_LIBRARY_PATH}
 chmod +x ${SOURCE_DIR}/openturns-1.18/python/test/t_features.py
-${SOURCE_DIR}/openturns-1.18/python/test/t_features.py
+${PYTHONBIN} ${SOURCE_DIR}/openturns-1.18/python/test/t_features.py
 if [ $? -ne 0 ]
 then
     echo "ERROR  testing Openturns features...."
@@ -331,14 +345,22 @@ if [[ -d "$SOURCE_DIR/otfftw-0.11" ]]; then
            DB10)
                 SITE_PATCH=/usr/lib/python3/dist-packages/setuptools/site-patch.py
                 ;;
+           UB22*)
+                SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py
+                ;;
            UB20*)
                 SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py
                 ;;
            FD32)
                 SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py
                 ;;
+           FD36)
+                ###SITE_PATCH=
+                SITE_PATCH=$SOURCE_DIR/addons/site-patch.py
+                ;;
            FD34)
-                SITE_PATCH=
+                ###SITE_PATCH=
+                SITE_PATCH=$SOURCE_DIR/addons/site-patch.py
                 ;;
            CO8*)
                 SITE_PATCH=/usr/lib/pypy/dist-packages/setuptools/site-patch.py