hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed the "+shared" variant in the "hdf5" package.

Browse source
This commit is contained in:
Joseph Ciurej 2016-02-17 11:51:24 -08:00
parent 0388093f7a
commit 6cd76d69c3
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
var/spack/repos/builtin/packages/exodusii/package.py
View file

@ -23,7 +23,7 @@ class Exodusii(Package):
# TODO: Make this a build dependency once build dependencies are supported # TODO: Make this a build dependency once build dependencies are supported
# (see: https://github.com/LLNL/spack/pull/378). # (see: https://github.com/LLNL/spack/pull/378).
depends_on('cmake@2.8.7:') depends_on('cmake@2.8.7:')
depends_on('hdf5+shared~mpi') depends_on('hdf5~shared~mpi')
depends_on('netcdf~mpi') depends_on('netcdf~mpi')
patch('exodus-cmake.patch') patch('exodus-cmake.patch')

7
var/spack/repos/builtin/packages/hdf5/package.py
View file

@ -42,7 +42,7 @@ class Hdf5(Package):
version('1.8.13', 'c03426e9e77d7766944654280b467289') version('1.8.13', 'c03426e9e77d7766944654280b467289')
variant('debug', default=False, description='Builds a debug version of the library') variant('debug', default=False, description='Builds a debug version of the library')
variant('shared', default=False, description='Builds a static executable version of the library') variant('shared', default=True, description='Builds a shared version of the library')
variant('cxx', default=True, description='Enable C++ support') variant('cxx', default=True, description='Enable C++ support')
variant('fortran', default=True, description='Enable Fortran support') variant('fortran', default=True, description='Enable Fortran support')
@ -79,7 +79,9 @@ def install(self, spec, prefix):
else: else:
extra_args.append('--enable-production') extra_args.append('--enable-production')
if '+static' in spec: if '+shared' in spec:
extra_args.append('--enable-shared')
else:
extra_args.append('--enable-static-exec') extra_args.append('--enable-static-exec')
if '+unsupported' in spec: if '+unsupported' in spec:
@ -123,7 +125,6 @@ def install(self, spec, prefix):
configure( configure(
"--prefix=%s" % prefix, "--prefix=%s" % prefix,
"--with-zlib=%s" % spec['zlib'].prefix, "--with-zlib=%s" % spec['zlib'].prefix,
"--enable-shared", # TODO : this should be enabled by default, remove it?
*extra_args) *extra_args)
make() make()
make("install") make("install")