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

Fix zlib %pgi build (#3436)

Browse source
This commit is contained in:
Adam J. Stewart 2017-03-14 09:43:54 -05:00 committed by Todd Gamblin
parent 415c9398d2
commit b203058891
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
var/spack/repos/builtin/packages/zlib/package.py
View file

@ -25,13 +25,15 @@
from spack import * from spack import *
class Zlib(AutotoolsPackage): # Although zlib comes with a configure script, it does not use Autotools
# The AutotoolsPackage causes zlib to fail to build with PGI
class Zlib(Package):
"""A free, general-purpose, legally unencumbered lossless """A free, general-purpose, legally unencumbered lossless
data-compression library.""" data-compression library."""
homepage = "http://zlib.net" homepage = "http://zlib.net"
# URL must remain http:// so Spack can bootstrap curl # URL must remain http:// so Spack can bootstrap curl
url = "http://zlib.net/fossils/zlib-1.2.10.tar.gz" url = "http://zlib.net/fossils/zlib-1.2.11.tar.gz"
version('1.2.11', '1c9f62f0778697a09d36121ead88e08e') version('1.2.11', '1c9f62f0778697a09d36121ead88e08e')
# Due to the bug fixes, any installations of 1.2.9 or 1.2.10 should be # Due to the bug fixes, any installations of 1.2.9 or 1.2.10 should be
@ -47,8 +49,13 @@ def setup_environment(self, spack_env, run_env):
if '+pic' in self.spec: if '+pic' in self.spec:
spack_env.set('CFLAGS', self.compiler.pic_flag) spack_env.set('CFLAGS', self.compiler.pic_flag)
def configure_args(self): def install(self, spec, prefix):
config_args = [] config_args = []
if '+shared' not in self.spec: if '~shared' in spec:
config_args.append('--static') config_args.append('--static')
return config_args configure('--prefix={0}'.format(prefix), *config_args)
make()
if self.run_tests:
make('check')
make('install')