spns #29664: omniORB: fix python path

[tools/sat_salome.git] / products / compil_scripts / scotch-6.0.4.sh

diff --git a/products/compil_scripts/scotch-6.0.4.sh b/products/compil_scripts/scotch-6.0.4.sh
index 19c52076234a74fdc0b4301479198288dc638d2d..08f49dfcef3d6acc411ba2e77ba6bcc6436ec7c3 100755 (executable)
--- a/products/compil_scripts/scotch-6.0.4.sh
+++ b/products/compil_scripts/scotch-6.0.4.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "##########################################################################"
-echo "ptscotch" $VERSION
+echo "scotch" $VERSION
 echo "##########################################################################"
 
 echo
@@ -20,7 +20,7 @@ echo "*** create Makefile"
 if [ -n "$SAT_HPC" ]; then
     sed -e "s%CFLAGS\([[:space:]]*\)=\([[:space:]]*\)\(.*\)%CFLAGS\1=\2-fPIC -DPIC -DINTSIZE64 -DSCOTCH_PTHREAD -I${MPI_INCLUDE_DIR} \3%g" Make.inc/Makefile.inc.x86-64_pc_linux2 > Makefile.inc
 else
-    sed -e "s%CFLAGS\([[:space:]]*\)=\([[:space:]]*\)\(.*\)%CFLAGS\1=\2-fPIC -DPIC -DINTSIZE64 -DSCOTCH_PTHREAD \3%g" Make.inc/Makefile.inc.x86-64_pc_linux2 > Makefile.inc
+    sed -e "s%CFLAGS\([[:space:]]*\)=\([[:space:]]*\)\(.*\)%CFLAGS\1=\2-fPIC \3%g" Make.inc/Makefile.inc.x86-64_pc_linux2 > Makefile.inc
 fi
 sed -e "s%LDFLAGS\([[:space:]]*\)=\([[:space:]]*\)\(.*\)%LDFLAGS\1=\2 \3 -lpthread%g" Makefile.inc > Makefile.in_new
 mv Makefile.in_new Makefile.inc
@@ -34,28 +34,42 @@ then
     exit 2
 fi
 
-echo
-echo "*** Check if node is a virtual machine"
-ISVM=$(hostnamectl status|grep -i chassis:|grep vm)
-if [ ! -z "$ISVM" ]; then
-    echo "*** oversubscribe..."
-    sed -i 's/mpirun -n 4/mpirun -n 4 --oversubscribe/g' $BUILD_DIR/src/check/Makefile
-else
-    echo "*** hostnamectl says that $HOSTNAME is *NOT* a virtual machine"
-fi
+# TODO: Open ARTIFACT
+DO_CHECK=0
+# DO_CHECK=1
+# LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION"
+# case $LINUX_DISTRIBUTION in
+#     CO*|FD*)
+#      DO_CHECK=0
+#      ;;
+# esac
 
-echo
-echo "*** make ptcheck"
-cd $BUILD_DIR/src
-if [ -n "$SAT_HPC" ]; then
-    make ptcheck
-else
-    make check
-fi
-if [ $? -ne 0 ]
-then
-    echo "ERROR on make check"
-    exit 3
+if [ $DO_CHECK -eq 1 ]; then
+    echo
+    echo "*** Check if node is a virtual machine"
+    ISVM=$(hostnamectl status|grep -i chassis:|grep vm)
+    if [ ! -z "$ISVM" ]; then
+       echo "*** oversubscribe..."
+       sed -i 's/mpirun -n 4/mpirun -n 4 --oversubscribe/g' $BUILD_DIR/src/check/Makefile
+    else
+       echo "*** hostnamectl says that $HOSTNAME is *NOT* a virtual machine"
+    fi
+    
+    cd $BUILD_DIR/src
+    if [ -n "$SAT_HPC" ]; then
+       echo
+       echo "*** make ptcheck"
+       make ptcheck
+    else
+       echo
+       echo "*** make check"
+       make check
+    fi
+    if [ $? -ne 0 ]
+    then
+       echo "ERROR on make check"
+       exit 3
+    fi
 fi
 
 echo