summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2016-07-13 16:34:11 -0500
committerAdam J. Stewart <ajstewart426@gmail.com>2016-08-01 13:35:22 -0500
commit0903ae0599b6a2a9ff91d3f7939b56a6dc476032 (patch)
treee19b539dcc500cf1036578674dbdebdbe4f8e62e /var
parent1e3a5d4e26a8da593dcb5334673c4541ab31baa7 (diff)
downloadspack-0903ae0599b6a2a9ff91d3f7939b56a6dc476032.tar.gz
spack-0903ae0599b6a2a9ff91d3f7939b56a6dc476032.tar.bz2
spack-0903ae0599b6a2a9ff91d3f7939b56a6dc476032.tar.xz
spack-0903ae0599b6a2a9ff91d3f7939b56a6dc476032.zip
Final fixes to get libctl working
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/libctl/package.py7
-rw-r--r--var/spack/repos/builtin/packages/meep/package.py4
2 files changed, 6 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/libctl/package.py b/var/spack/repos/builtin/packages/libctl/package.py
index 1b48d4dc29..946fc11271 100644
--- a/var/spack/repos/builtin/packages/libctl/package.py
+++ b/var/spack/repos/builtin/packages/libctl/package.py
@@ -38,9 +38,10 @@ class Libctl(Package):
def install(self, spec, prefix):
configure('--prefix={0}'.format(prefix),
- 'GUILE={0}'.format(spec['guile'].prefix))
+ 'GUILE={0}'.format(join_path(
+ spec['guile'].prefix.bin, 'guile')),
+ 'GUILE_CONFIG={0}'.format(join_path(
+ spec['guile'].prefix.bin, 'guile-config')))
make()
- make('check')
make('install')
- make('installcheck')
diff --git a/var/spack/repos/builtin/packages/meep/package.py b/var/spack/repos/builtin/packages/meep/package.py
index 73ed09af05..184b6f438e 100644
--- a/var/spack/repos/builtin/packages/meep/package.py
+++ b/var/spack/repos/builtin/packages/meep/package.py
@@ -38,8 +38,8 @@ class Meep(Package):
variant('blas', default=True, description='Enable BLAS support')
variant('lapack', default=True, description='Enable LAPACK support')
variant('harminv', default=True, description='Enable Harminv support')
- variant('guile', default=False, description='Enable Guilde support')
- variant('libctl', default=False, description='Enable libctl support')
+ variant('guile', default=True, description='Enable Guilde support')
+ variant('libctl', default=True, description='Enable libctl support')
variant('mpi', default=True, description='Enable MPI support')
variant('hdf5', default=True, description='Enable HDF5 support')
variant('gsl', default=False, description='Build with GSL (only necessary for testing)')