diff options
author | wiz <wiz@pkgsrc.org> | 2017-10-04 11:53:10 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-10-04 11:53:10 +0000 |
commit | 3a9a201d96e0da7263bc8fb9ce267ccbd5158169 (patch) | |
tree | bd709aa45c6a87a34f6488343c5cf7187cbff38b /www | |
parent | aa18e58a14978e9a5fcc157b8c6fb9d531373daa (diff) | |
download | pkgsrc-3a9a201d96e0da7263bc8fb9ce267ccbd5158169.tar.gz |
serf: Fix build with scons-3.0.
Diffstat (limited to 'www')
-rw-r--r-- | www/serf/distinfo | 4 | ||||
-rw-r--r-- | www/serf/patches/patch-SConstruct | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/www/serf/distinfo b/www/serf/distinfo index 295950636cc..eccd3b6eaee 100644 --- a/www/serf/distinfo +++ b/www/serf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.22 2016/12/07 20:00:20 maya Exp $ +$NetBSD: distinfo,v 1.23 2017/10/04 11:53:10 wiz Exp $ SHA1 (serf-1.3.9.tar.bz2) = 26015c63e3bbb108c1689bf2090e4c26351db674 RMD160 (serf-1.3.9.tar.bz2) = 4bbc773841eb2bd83a7c12170937b403201dd83b SHA512 (serf-1.3.9.tar.bz2) = 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d Size (serf-1.3.9.tar.bz2) = 145132 bytes -SHA1 (patch-SConstruct) = e9b1b937c13875bfd7a08fdf5fe5c56afe4734ae +SHA1 (patch-SConstruct) = 22ade50e574ae503d40158558e03f5063da7df1c diff --git a/www/serf/patches/patch-SConstruct b/www/serf/patches/patch-SConstruct index a48493fd23d..f5c92ed2051 100644 --- a/www/serf/patches/patch-SConstruct +++ b/www/serf/patches/patch-SConstruct @@ -1,8 +1,9 @@ -$NetBSD: patch-SConstruct,v 1.8 2016/12/07 20:00:20 maya Exp $ +$NetBSD: patch-SConstruct,v 1.9 2017/10/04 11:53:10 wiz Exp $ Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin. Don't append -O2 compiler flag. Don't special case sunos5 in naming shlibs +Fix build with scons-3.x. --- SConstruct.orig 2015-09-17 12:46:24.000000000 +0000 +++ SConstruct @@ -23,6 +24,15 @@ Don't special case sunos5 in naming shlibs tools=('default', 'textfile',), CPPPATH=['.', ], ) +@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print ('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU']) @@ -215,8 +216,7 @@ incdir = '$PREFIX/include/serf-$MAJOR' # Unfortunately we can't set the .dylib compatibility_version option separately # from current_version, so don't use the PATCH level to avoid that build and |