hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

looptools: skip UNDERSCORE check and add -Fwide (#18135)

Browse source
This commit is contained in:
ketsubouchi 2020-08-29 00:03:38 +09:00 committed by GitHub
parent abffcefadd
commit 1d0650b2cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
var/spack/repos/builtin/packages/looptools/conf.patch Normal file
View file

@ -0,0 +1,45 @@
diff -u -r -N a/configure b/configure
--- a/configure 2020-08-18 12:07:36.000000000 +0900
+++ b/configure 2020-08-18 12:52:34.000000000 +0900
@@ -243,30 +243,8 @@
## does Fortran append underscores to symbols?
-echo -n "does $CONF_FC append underscores... " 1>&3
-
-tee $test-c.c << _EOF_ 1>&2
-int uscore_ = 95;
-int uscore = 59;
-_EOF_
-
-for CONF_BITS in ${CONF_BITS:--m64 -m32} "" ; do
- eval $CONF_CC$CONF_CFLAGS $CONF_BITS -c $test-c.c 1>&2 || continue
- eval $CONF_FC$CONF_FFLAGS -o $test$CONF_EXE $test.f $test-c.o $CONF_LDFLAGS 1>&2 && break
-done
-
-./$test$CONF_EXE
-case $? in
-95)
- echo "yes" 1>&3
- CONF_NOUNDERSCORE=0 ;;
-59)
- echo "no" 1>&3
- CONF_NOUNDERSCORE=1 ;;
-*)
- echo "error linking Fortran and C" 1>&3
- exit 1 ;;
-esac
+CONF_BITS=""
+CONF_NOUNDERSCORE=0
CONF_CFLAGS+=" $CONF_BITS"
CONF_CXXFLAGS+=" $CONF_BITS"
@@ -426,7 +404,7 @@
QUADSIZE = $CONF_QUADSIZE
FC = $CONF_FC
-FFLAGS =$CONF_FFLAGS \\
+FFLAGS =-Fwide $CONF_FFLAGS \\
\$(DEF)QUAD=\$(QUAD) \$(DEF)QUADSIZE=\$(QUADSIZE) \\
\$(DEF)U77EXT=$CONF_U77EXT

2
var/spack/repos/builtin/packages/looptools/package.py
View file

@ -19,6 +19,8 @@ class Looptools(AutotoolsPackage):
version('2.15', sha256='a065ffdc4fe6882aa3bb926134ba8ec875d6c0a633c3d4aa5f70db26542713f2') version('2.15', sha256='a065ffdc4fe6882aa3bb926134ba8ec875d6c0a633c3d4aa5f70db26542713f2')
version('2.8', sha256='2395518d0eac9b0883a2c249b9a5ba80df443929c520c45e60f5a4284166eb42') version('2.8', sha256='2395518d0eac9b0883a2c249b9a5ba80df443929c520c45e60f5a4284166eb42')
patch('conf.patch', when='%fj')
def configure_args(self): def configure_args(self):
args = ["FFLAGS=" + self.compiler.f77_pic_flag, args = ["FFLAGS=" + self.compiler.f77_pic_flag,
"CFLAGS=" + self.compiler.cc_pic_flag] "CFLAGS=" + self.compiler.cc_pic_flag]