From d18da1e2a1b0bdfe0a5a56cbdc267440186a9683 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 30 Mar 2022 13:58:06 +0200 Subject: [PATCH] scotch: fix sequential build --- products/compil_scripts/scotch-6.0.4.sh | 20 +++++++++++--------- products/compil_scripts/scotch-6.1.2.sh | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/products/compil_scripts/scotch-6.0.4.sh b/products/compil_scripts/scotch-6.0.4.sh index c50acdd..08f49df 100755 --- 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,13 +34,15 @@ then exit 2 fi -DO_CHECK=1 -LINUX_DISTRIBUTION="$DIST_NAME$DIST_VERSION" -case $LINUX_DISTRIBUTION in - CO*|FD*) - DO_CHECK=0 - ;; -esac +# 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 if [ $DO_CHECK -eq 1 ]; then echo diff --git a/products/compil_scripts/scotch-6.1.2.sh b/products/compil_scripts/scotch-6.1.2.sh index e32a1fa..3f25f0e 100755 --- a/products/compil_scripts/scotch-6.1.2.sh +++ b/products/compil_scripts/scotch-6.1.2.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 -- 2.39.2