diff options
author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2017-05-23 17:04:23 +0200 |
---|---|---|
committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-05-23 10:04:23 -0500 |
commit | e89c699c06268aadca01255a006c6890a933dacf (patch) | |
tree | 010b2749aa7c908af792be0798865314f334db1b | |
parent | dd73c98d0e7d4e1ca7fe1750ee2bf3997d994715 (diff) | |
download | spack-e89c699c06268aadca01255a006c6890a933dacf.tar.gz spack-e89c699c06268aadca01255a006c6890a933dacf.tar.bz2 spack-e89c699c06268aadca01255a006c6890a933dacf.tar.xz spack-e89c699c06268aadca01255a006c6890a933dacf.zip |
plumed: fixed compilation on rhel6 (#4318)
* plumed: fixed compilation on rhel6 with mvapich2 and gcc@5.4.0 (#77)
* plumed: prevent parallel compilation, as it breaks for the newest version
-rw-r--r-- | var/spack/repos/builtin/packages/plumed/package.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index de59f57208..5b22fdb4ea 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -113,6 +113,8 @@ class Plumed(AutotoolsPackage): force_autoreconf = True + parallel = False + def apply_patch(self, other): plumed = subprocess.Popen( [join_path(self.spec.prefix.bin, 'plumed'), 'patch', '-p'], @@ -126,7 +128,7 @@ class Plumed(AutotoolsPackage): def setup_dependent_package(self, module, dependent_spec): # Make plumed visible from dependent packages - module.plumed = self.spec['plumed'].command + module.plumed = dependent_spec['plumed'].command @run_before('autoreconf') def filter_gslcblas(self): @@ -162,6 +164,14 @@ class Plumed(AutotoolsPackage): 'STATIC_LIBS=-mt_mpi' ]) + # Set flags to help find gsl + if '+gsl' in self.spec: + gsl_libs = self.spec['gsl'].libs + blas_libs = self.spec['blas'].libs + configure_opts.append('LDFLAGS={0}'.format( + (gsl_libs + blas_libs).ld_flags + )) + # Additional arguments configure_opts.extend([ '--enable-shared={0}'.format('yes' if '+shared' in spec else 'no'), |