diff options
| author | Sergey Kosukhin <skosukhin@gmail.com> | 2018-04-06 22:44:39 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-04-06 15:44:39 -0500 |
| commit | c328c667c0aae1c5f3171ce7b0a3779a2e27c60f (patch) | |
| tree | b2034ade2ff148e9e05d16572947eb847c3da28d /var | |
| parent | fa3edd4af094bd6bf6f5a56668302eef19284bb3 (diff) | |
| download | spack-c328c667c0aae1c5f3171ce7b0a3779a2e27c60f.tar.gz spack-c328c667c0aae1c5f3171ce7b0a3779a2e27c60f.tar.bz2 spack-c328c667c0aae1c5f3171ce7b0a3779a2e27c60f.tar.xz spack-c328c667c0aae1c5f3171ce7b0a3779a2e27c60f.zip | |
Package 'serf': link to the spack provided zlib installation. (#7667)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/serf/package.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/serf/package.py b/var/spack/repos/builtin/packages/serf/package.py index 2b44a021f8..a0a10fedf1 100644 --- a/var/spack/repos/builtin/packages/serf/package.py +++ b/var/spack/repos/builtin/packages/serf/package.py @@ -54,6 +54,19 @@ class Serf(SConsPackage): 'ZLIB={0}'.format(spec['zlib'].prefix), ] + # ZLIB variable is ignored on non-Windows platforms before and + # including the version 1.3.9: + # https://www.mail-archive.com/dev@serf.apache.org/msg01359.html + # The issue is fixed in the trunk. Hopefully, the next stable version + # will work properly. + if '@:1.3.9' in self.spec: + zlib_spec = self.spec['zlib'] + link_flags = [zlib_spec.libs.search_flags] + link_flags.extend([self.compiler.cc_rpath_arg + d + for d in zlib_spec.libs.directories]) + args.append('LINKFLAGS=' + ' '.join(link_flags)) + args.append('CPPFLAGS=' + zlib_spec.headers.cpp_flags) + if '+debug' in spec: args.append('DEBUG=yes') else: |