From: Guytri KASTANE <guytri.kastane@cea.fr>
Date: Mon, 28 Oct 2024 10:14:40 +0000 (+0100)
Subject: bos #43318: fixed installation path on Fedora and CentOS
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2a56d7f033aabb36f044f6cc8efc7a0e576c8faa;p=tools%2Fsat_salome.git

bos #43318: fixed installation path on Fedora and CentOS
---

diff --git a/products/compil_scripts/openturns-1.23.sh b/products/compil_scripts/openturns-1.23.sh
index 2132b95..f193f87 100755
--- a/products/compil_scripts/openturns-1.23.sh
+++ b/products/compil_scripts/openturns-1.23.sh
@@ -367,6 +367,15 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then
                     echo "*** skipping: since system Cython too old"
                     continue
                 fi
+                echo "INFO: install joblib-1.1.0"
+				if ! ${PYTHONBIN} -c "import joblib"; then
+					${PYTHONBIN} -m pip install  --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/joblib-1.1.0/joblib-1.1.0-py2.py3-none-any.whl --no-deps
+					if [ $? -ne 0 ]
+					then
+						echo "FATAL: could not install joblib-1.1.0"
+						exit 6
+					fi
+				fi
                 if ! ${PYTHONBIN} -c "import sklearn"; then
                     if [ "${LINUX_DISTRIBUTION}" != "DB10" ]; then
                         echo "INFO: install scikit-learn-1.2.2"
@@ -459,7 +468,7 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then
                 ${PYTHONBIN} -m pip install --cache-dir=$BUILD_DIR/cache/pip $SOURCE_DIR/threadpoolctl-3.0.0/threadpoolctl-3.0.0-py3-none-any.whl --no-deps
                 if [ $? -ne 0 ]
                 then
-                    echo "FATAL: could not install readpoolctl 3.0.0"
+                    echo "FATAL: could not install threadpoolctl 3.0.0"
                     exit 6
                 fi
                 echo "INFO: install joblib-1.1.0"
@@ -531,6 +540,15 @@ if [[ -d "$SOURCE_DIR/otfftw-0.15" ]]; then
             done
             rm -rf $PRODUCT_INSTALL/local
         fi
+        if [ -d "${PRODUCT_INSTALL}/lib64" ]; then
+            echo "WARNING: moving lib64 to lib"
+            mv $PRODUCT_INSTALL/lib64/python$PYTHON_VERSION/site-packages/* $PRODUCT_INSTALL/lib/python$PYTHON_VERSION/site-packages/
+            rm -rf ${PRODUCT_INSTALL}/lib64
+        elif [ -d "${PRODUCT_INSTALL}/local/lib64" ]; then
+            echo "WARNING: moving local/lib64 to lib"
+            mv $PRODUCT_INSTALL/lib64/python$PYTHON_VERSION/site-packages/* $PRODUCT_INSTALL/lib/python$PYTHON_VERSION/site-packages/
+            rm -rf ${PRODUCT_INSTALL}/local/lib64
+        fi
     done
 
     #