diff options
| author | ketsubouchi <kenta.tsubouchi@hac-inc.co.jp> | 2020-08-29 00:03:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 10:03:38 -0500 |
| commit | 1d0650b2cbbb623447eaa68c3a50933174220659 (patch) | |
| tree | fad3cf7225c77656ed08a74cbea7f6ee19e1b0bc | |
| parent | abffcefadd7b1963af30cdfc7314a295babbe79b (diff) | |
| download | spack-1d0650b2cbbb623447eaa68c3a50933174220659.tar.gz spack-1d0650b2cbbb623447eaa68c3a50933174220659.tar.bz2 spack-1d0650b2cbbb623447eaa68c3a50933174220659.tar.xz spack-1d0650b2cbbb623447eaa68c3a50933174220659.zip | |
looptools: skip UNDERSCORE check and add -Fwide (#18135)
| -rw-r--r-- | var/spack/repos/builtin/packages/looptools/conf.patch | 45 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/looptools/package.py | 2 |
2 files changed, 47 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/looptools/conf.patch b/var/spack/repos/builtin/packages/looptools/conf.patch new file mode 100644 index 0000000000..947b8917d1 --- /dev/null +++ b/var/spack/repos/builtin/packages/looptools/conf.patch @@ -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 + diff --git a/var/spack/repos/builtin/packages/looptools/package.py b/var/spack/repos/builtin/packages/looptools/package.py index 7d31173dcf..b3cc941f06 100644 --- a/var/spack/repos/builtin/packages/looptools/package.py +++ b/var/spack/repos/builtin/packages/looptools/package.py @@ -19,6 +19,8 @@ class Looptools(AutotoolsPackage): version('2.15', sha256='a065ffdc4fe6882aa3bb926134ba8ec875d6c0a633c3d4aa5f70db26542713f2') version('2.8', sha256='2395518d0eac9b0883a2c249b9a5ba80df443929c520c45e60f5a4284166eb42') + patch('conf.patch', when='%fj') + def configure_args(self): args = ["FFLAGS=" + self.compiler.f77_pic_flag, "CFLAGS=" + self.compiler.cc_pic_flag] |