zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1650 from davydden/pkg/ape_octopus_comments

Browse Source 
ape octopus: in-code comments
This commit is contained in:
Todd Gamblin 2016-08-29 06:02:19 -07:00 committed by GitHub
commit f5c9a8c2ee
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/ape/package.py
View File

@ -45,6 +45,13 @@ def install(self, spec, prefix):
'--with-libxc-prefix=%s' % spec['libxc'].prefix '--with-libxc-prefix=%s' % spec['libxc'].prefix
]) ])
# When preprocessor expands macros (i.e. CFLAGS) defined as quoted
# strings the result may be > 132 chars and is terminated.
# This will look to a compiler as an Unterminated character constant
# and produce Line truncated errors. To vercome this, add flags to
# let compiler know that the entire line is meaningful.
# TODO: For the lack of better approach, assume that clang is mixed
# with GNU fortran.
if spec.satisfies('%clang') or spec.satisfies('%gcc'): if spec.satisfies('%clang') or spec.satisfies('%gcc'):
args.extend([ args.extend([
'FCFLAGS=-O2 -ffree-line-length-none' 'FCFLAGS=-O2 -ffree-line-length-none'

11
var/spack/repos/builtin/packages/octopus/package.py
View File

@ -70,10 +70,13 @@ def install(self, spec, prefix):
# --with-berkeleygw-prefix=${prefix} # --with-berkeleygw-prefix=${prefix}
]) ])
# Supposedly configure does not pick up the required flags for gfortran # When preprocessor expands macros (i.e. CFLAGS) defined as quoted
# Without it there are: # strings the result may be > 132 chars and is terminated.
# Error: Line truncated @ global.F90:157:132 # This will look to a compiler as an Unterminated character constant
# Error: Unterminated character constant @ global.F90:157:20 # and produce Line truncated errors. To vercome this, add flags to
# let compiler know that the entire line is meaningful.
# TODO: For the lack of better approach, assume that clang is mixed
# with GNU fortran.
if spec.satisfies('%clang') or spec.satisfies('%gcc'): if spec.satisfies('%clang') or spec.satisfies('%gcc'):
args.extend([ args.extend([
'FCFLAGS=-O2 -ffree-line-length-none' 'FCFLAGS=-O2 -ffree-line-length-none'