diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/cp2k/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libint/package.py | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 18ec324a7e..22c84cf11f 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -486,7 +486,7 @@ class Cp2k(MakefilePackage, CudaPackage): # Currently AOCC support only static libraries of ELPA if '%aocc' in spec: - libs.append(join_path(elpa.libs.directories[0], + libs.append(join_path(elpa.prefix.lib, ('libelpa{elpa_suffix}.a' .format(elpa_suffix=elpa_suffix)))) else: diff --git a/var/spack/repos/builtin/packages/libint/package.py b/var/spack/repos/builtin/packages/libint/package.py index d44eaa44fe..82604b8b87 100644 --- a/var/spack/repos/builtin/packages/libint/package.py +++ b/var/spack/repos/builtin/packages/libint/package.py @@ -74,7 +74,13 @@ class Libint(AutotoolsPackage): return "{0}/v{1}.tar.gz".format(base_url, version) def autoreconf(self, spec, prefix): - which('bash')('autogen.sh') + if self.spec.satisfies("@2:"): + which('bash')('autogen.sh') + else: + # Fall back since autogen is not available + libtoolize() + aclocal('-I', 'lib/autoconf') + autoconf() if '@2.6.0:' in spec: # skip tarball creation and removal of dir with generated code @@ -103,10 +109,15 @@ class Libint(AutotoolsPackage): def configure_args(self): config_args = [ - '--enable-shared', - '--with-boost={0}'.format(self.spec['boost'].prefix) + '--enable-shared' ] + if self.spec.satisfies("@2:"): + # --with-boost option available only from version 2 and above + config_args.extend([ + '--with-boost={0}'.format(self.spec['boost'].prefix) + ]) + # Optimization flag names have changed in libint 2 if self.version < Version('2.0.0'): config_args.extend([ |