diff options
| author | Kelly (KT) Thompson <kgt@lanl.gov> | 2016-06-09 18:30:28 -0600 |
|---|---|---|
| committer | Kelly (KT) Thompson <kgt@lanl.gov> | 2016-06-09 18:30:28 -0600 |
| commit | 915115386af09583dc7dfff094b259990179bb4a (patch) | |
| tree | 122f350485f188590abdb46b66904a47b2876b2d /var | |
| parent | 30e8e77fb60b06535b49d54db62781299f555a8d (diff) | |
| download | spack-915115386af09583dc7dfff094b259990179bb4a.tar.gz spack-915115386af09583dc7dfff094b259990179bb4a.tar.bz2 spack-915115386af09583dc7dfff094b259990179bb4a.tar.xz spack-915115386af09583dc7dfff094b259990179bb4a.zip | |
Package serf also depends on zlib.
+ Add zlib as a required dependency.
+ Point scons build system to the spack provided zlib installation.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/serf/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index 3b1d08889c..7ca72096aa 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -36,6 +36,7 @@ class Serf(Package): depends_on('scons') depends_on('expat') depends_on('openssl') + depends_on('zlib') def install(self, spec, prefix): scons = which("scons") @@ -44,8 +45,10 @@ class Serf(Package): options.append('APR=%s' % spec['apr'].prefix) options.append('APU=%s' % spec['apr-util'].prefix) options.append('OPENSSL=%s' % spec['openssl'].prefix) - options.append('LINKFLAGS=-L%s/lib' % spec['expat'].prefix) - options.append('CPPFLAGS=-I%s/include' % spec['expat'].prefix) + options.append('LINKFLAGS=-L%s/lib -L%s/lib' % + ( spec['expat'].prefix, spec['zlib'].prefix )) + options.append('CPPFLAGS=-I%s/include -I%s/include' % + ( spec['expat'].prefix, spec['zlib'].prefix )) scons(*options) scons('install') |