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

Fix issues linking hDF5 1.8.14 and below on Ubuntu. (#2772)

Browse Source
This commit is contained in:
Todd Gamblin 2017-01-07 09:03:50 -08:00 committed by GitHub
parent e39ba88e9c
commit f379697985
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/hdf5/package.py
View File

@ -22,7 +22,6 @@
# License along with this program; if not, write to the Free Software # License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import shutil import shutil
@ -48,6 +47,7 @@ class Hdf5(AutotoolsPackage):
version('1.8.17', '7d572f8f3b798a628b8245af0391a0ca') version('1.8.17', '7d572f8f3b798a628b8245af0391a0ca')
version('1.8.16', 'b8ed9a36ae142317f88b0c7ef4b9c618') version('1.8.16', 'b8ed9a36ae142317f88b0c7ef4b9c618')
version('1.8.15', '03cccb5b33dbe975fdcd8ae9dc021f24') version('1.8.15', '03cccb5b33dbe975fdcd8ae9dc021f24')
version('1.8.14', 'a482686e733514a51cde12d6fe5c5d95')
version('1.8.13', 'c03426e9e77d7766944654280b467289') version('1.8.13', 'c03426e9e77d7766944654280b467289')
version('1.8.12', 'd804802feb99b87fc668a90e6fa34411') version('1.8.12', 'd804802feb99b87fc668a90e6fa34411')
@ -156,6 +156,20 @@ def configure_args(self):
return ["--with-zlib=%s" % spec['zlib'].prefix] + extra_args return ["--with-zlib=%s" % spec['zlib'].prefix] + extra_args
def configure(self, spec, prefix):
# Run the default autotools package configure
super(Hdf5, self).configure(spec, prefix)
if '@:1.8.14' in spec:
# On Ubuntu14, HDF5 1.8.12 (and maybe other versions)
# mysteriously end up with "-l -l" in the postdeps in the
# libtool script. Patch this by removing the spurious -l's.
filter_file(
r'postdeps="([^"]*)"',
lambda m: 'postdeps="%s"' % ' '.join(
arg for arg in m.group(1).split(' ') if arg != '-l'),
'libtool')
@AutotoolsPackage.sanity_check('install') @AutotoolsPackage.sanity_check('install')
def check_install(self): def check_install(self):
# Build and run a small program to test the installed HDF5 library # Build and run a small program to test the installed HDF5 library