Merge pull request #1037 from KineticTheory/develop

Package serf also depends on zlib.
This commit is contained in:
Todd Gamblin 2016-06-15 08:57:14 -07:00 committed by GitHub
commit ff3469385b

View file

@ -24,8 +24,10 @@
############################################################################## ##############################################################################
from spack import * from spack import *
class Serf(Package): 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/' homepage = 'https://serf.apache.org/'
url = 'https://archive.apache.org/dist/serf/serf-1.3.8.tar.bz2' 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('scons')
depends_on('expat') depends_on('expat')
depends_on('openssl') depends_on('openssl')
depends_on('zlib')
def install(self, spec, prefix): def install(self, spec, prefix):
scons = which("scons") scons = which("scons")
@ -44,8 +47,10 @@ def install(self, spec, prefix):
options.append('APR=%s' % spec['apr'].prefix) options.append('APR=%s' % spec['apr'].prefix)
options.append('APU=%s' % spec['apr-util'].prefix) options.append('APU=%s' % spec['apr-util'].prefix)
options.append('OPENSSL=%s' % spec['openssl'].prefix) options.append('OPENSSL=%s' % spec['openssl'].prefix)
options.append('LINKFLAGS=-L%s/lib' % spec['expat'].prefix) options.append('LINKFLAGS=-L%s/lib -L%s/lib' %
options.append('CPPFLAGS=-I%s/include' % spec['expat'].prefix) (spec['expat'].prefix, spec['zlib'].prefix))
options.append('CPPFLAGS=-I%s/include -I%s/include' %
(spec['expat'].prefix, spec['zlib'].prefix))
scons(*options) scons(*options)
scons('install') scons('install')