Fix openturns compilation on native FD32 and CO8 (hack lib64 dir) - Fix ParaView...

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 3dbb2aac55f4266e372fa6c6e0681ac76e9363c4..c73613a4dbb48459d7665d386737ec9ff636f22e 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -180,11 +180,6 @@ APPLICATION :
 }
 __overwrite__ :
 [
-   {
-      # openturns - make install seems to not doing anything (although we see files installation in logs)
-      __condition__ : "VARS.dist in ['FD32', 'CO8']"
-      'APPLICATION.rm_products' : ['openturns']
-   }
    {
       # Although recent adaptations of GEOM CMake procedure to be compliant with openCV 4.X, some
       # deeper investigations need to be done in its sources. Use embedded openCV product where

diff --git a/products/compil_scripts/openturns.sh b/products/compil_scripts/openturns.sh
index 3a787d116f5346dd4ec3ccaf2386fa0dd322ab08..a64040abfc8d9525db8b4bdf42cf2c1f068e6567 100755 (executable)
--- a/products/compil_scripts/openturns.sh
+++ b/products/compil_scripts/openturns.sh
@@ -40,6 +40,12 @@ fi
 echo
 echo "*** check installation"
 
+if [ -d "${PRODUCT_INSTALL}/lib64" ]
+then
+    mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib
+    rmdir ${PRODUCT_INSTALL}/lib64
+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}/python/test/t_features.py

diff --git a/products/patches/paraview.0003-ParaViewClient.patch b/products/patches/paraview.0003-ParaViewClient.patch
index 52451335930e2fb3ded4e5386671e49a2549242c..c0409edb475dc9abceac296cf00ee9773bc92725 100644 (file)
--- a/products/patches/paraview.0003-ParaViewClient.patch
+++ b/products/patches/paraview.0003-ParaViewClient.patch
@@ -1,7 +1,11 @@
---- ParaView-5.8.0-RC2.orig/CMake/ParaViewClient.cmake 2020-03-02 15:38:53.791382799 +0300
-+++ ParaView-5.8.0-RC2.new/CMake/ParaViewClient.cmake  2020-03-02 18:31:04.304698442 +0300
-@@ -516,6 +516,7 @@
-     NAMES xmlpatterns-qt5 xmlpatterns
+--- ParaView.orig/CMake/ParaViewClient.cmake   2021-02-04 15:22:02.000000000 +0100
++++ ParaView.new/CMake/ParaViewClient.cmake    2021-04-23 17:37:01.814270336 +0200
+@@ -513,9 +513,10 @@
+ 
+   include("${_ParaViewClient_cmake_dir}/paraview-find-package-helpers.cmake" OPTIONAL)
+   find_program(qt_xmlpatterns_executable
+-    NAMES xmlpatterns-qt5 xmlpatterns
++    NAMES xmlpatterns xmlpatterns-qt5
      HINTS "${Qt5_DIR}/../../../bin"
            "${Qt5_DIR}/../../../libexec/qt5/bin"
 +    NO_CMAKE_PATH