diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-15 08:57:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-15 08:57:14 -0700 |
commit | ff3469385b4697d68bff01a7e21c0dd743017f0b (patch) | |
tree | 3c609a1ad9abf5df669eb11e151230a2c9884557 | |
parent | bfedeadacb22e9166bdf9ed20892998a5ea64445 (diff) | |
parent | 883f601bca7c6c8f26937b295dadfd2f6a4f023e (diff) | |
download | spack-ff3469385b4697d68bff01a7e21c0dd743017f0b.tar.gz spack-ff3469385b4697d68bff01a7e21c0dd743017f0b.tar.bz2 spack-ff3469385b4697d68bff01a7e21c0dd743017f0b.tar.xz spack-ff3469385b4697d68bff01a7e21c0dd743017f0b.zip |
Merge pull request #1037 from KineticTheory/develop
Package serf also depends on zlib.
-rw-r--r-- | var/spack/repos/builtin/packages/serf/package.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index 3b1d08889c..817db68241 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -24,8 +24,10 @@ ############################################################################## from spack import * + class Serf(Package): - """Apache Serf - a high performance C-based HTTP client library built upon the Apache Portable Runtime (APR) library""" + """Apache Serf - a high performance C-based HTTP client library + built upon the Apache Portable Runtime (APR) library""" homepage = 'https://serf.apache.org/' url = 'https://archive.apache.org/dist/serf/serf-1.3.8.tar.bz2' @@ -36,6 +38,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 +47,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') |