From: Guytri KASTANE <guytri.kastane@cea.fr>
Date: Thu, 21 Sep 2023 11:31:28 +0000 (+0200)
Subject: add modifications for native compilation
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ad1ea0638cef771b7522fe08cc5039263ddaa67d;p=tools%2Fsat_salome.git

add modifications for native compilation
---

diff --git a/products/compil_scripts/petsc-3.17.0.sh b/products/compil_scripts/petsc-3.17.0.sh
index 628d393..051daff 100755
--- a/products/compil_scripts/petsc-3.17.0.sh
+++ b/products/compil_scripts/petsc-3.17.0.sh
@@ -11,6 +11,7 @@ cd $BUILD_DIR
 cp -rf $SOURCE_DIR/* .
 
 CONFIGURE_FLAGS=
+CONFIGURE_FLAGS+=" --download-slepc=ext/slepc-3.19.2.tar.gz"
 CONFIGURE_FLAGS+=" --with-blaslapack-dir=${LAPACK_ROOT_DIR}"
 CONFIGURE_FLAGS+=" --with-python-dir=${PYTHON_ROOT_DIR}"
 CONFIGURE_FLAGS+=" --download-slepc=ext/slepc-3.17.0.tar.gz"
@@ -32,12 +33,13 @@ then
   then
       CONFIGURE_FLAGS+=" --with-mpi4py-dir=${MPI4PY_ROOT_DIR}"
   else
-      CONFIGURE_FLAGS+=" --download-mpi4py=ext/mpi4py-3.0.3.tar.gz"
+      CONFIGURE_FLAGS+=" --download-mpi4py=yes" #ext/mpi4py-3.0.3.tar.gz"
   fi
   echo "*** configure --prefix=${PRODUCT_INSTALL} --with-mpi-dir=${MPI_ROOT_DIR} ${CONFIGURE_FLAGS}"
   ./configure --prefix=${PRODUCT_INSTALL} --with-mpi-dir=${MPI_ROOT_DIR} ${CONFIGURE_FLAGS}
 else
-  CONFIGURE_FLAGS+=" --with-metis-dir=${METIS_ROOT_DIR}"
+  #CONFIGURE_FLAGS+=" --with-metis-dir=${METIS_ROOT_DIR}"
+  CONFIGURE_FLAGS+=" --download-metis=ext/metis-5.1.0-p11.tar.gz"
   echo "*** configure --prefix=${PRODUCT_INSTALL} --with-mpi=0 ${CONFIGURE_FLAGS}"
   ./configure --prefix=${PRODUCT_INSTALL} --with-mpi=0 ${CONFIGURE_FLAGS}
 fi
@@ -71,6 +73,15 @@ then
     exit 3
 fi
 
+echo
+echo "*** make check"
+make $MAKE_OPTIONS check
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make check"
+    exit 4
+fi
+
 echo
 echo "########## END"
 
diff --git a/products/petsc.pyconf b/products/petsc.pyconf
index 6256fe4..d9bbd83 100644
--- a/products/petsc.pyconf
+++ b/products/petsc.pyconf
@@ -25,6 +25,7 @@ version_3_19_4 :
 {
     compil_script :  "petsc-3.19.4.sh"
     depend : ["hdf5", "Python", "lapack","fftw", "llvm"]
+    patches: ['petsc-3.19.4-mpi4py.patch','petsc-3.19.4-libpath.patch']
 }
 
 version_3_17_0 :