diff options
| author | maya <maya> | 2016-12-07 20:00:20 +0000 |
|---|---|---|
| committer | maya <maya> | 2016-12-07 20:00:20 +0000 |
| commit | 35c555624c961e00e49f8eacb9dfb101cb1da34d (patch) | |
| tree | ccb0f38790fa17b21eb8289233fbb5303e502132 /www | |
| parent | 54f54fd0e3e637784d174df6db689833389785f0 (diff) | |
| download | pkgsrc-35c555624c961e00e49f8eacb9dfb101cb1da34d.tar.gz | |
serf: don't special case sunos5 in naming shlibs
This will likely fix PR pkg/51697: www/serf fails to package on Solaris
Diffstat (limited to 'www')
| -rw-r--r-- | www/serf/distinfo | 4 | ||||
| -rw-r--r-- | www/serf/patches/patch-SConstruct | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/www/serf/distinfo b/www/serf/distinfo index b0f9a77580d..295950636cc 100644 --- a/www/serf/distinfo +++ b/www/serf/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.21 2016/10/30 11:39:14 adam Exp $ +$NetBSD: distinfo,v 1.22 2016/12/07 20:00:20 maya 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) = 5f2d847f810486ba7dc1b0c3820169bc2aa129c7 +SHA1 (patch-SConstruct) = e9b1b937c13875bfd7a08fdf5fe5c56afe4734ae diff --git a/www/serf/patches/patch-SConstruct b/www/serf/patches/patch-SConstruct index cc5a2ce2210..a48493fd23d 100644 --- a/www/serf/patches/patch-SConstruct +++ b/www/serf/patches/patch-SConstruct @@ -1,7 +1,8 @@ -$NetBSD: patch-SConstruct,v 1.7 2016/10/30 11:39:14 adam Exp $ +$NetBSD: patch-SConstruct,v 1.8 2016/12/07 20:00:20 maya 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 --- SConstruct.orig 2015-09-17 12:46:24.000000000 +0000 +++ SConstruct @@ -22,7 +23,17 @@ Don't append -O2 compiler flag. tools=('default', 'textfile',), CPPPATH=['.', ], ) -@@ -257,7 +258,6 @@ if sys.platform != 'win32': +@@ -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 + # runtime patch levels have to be identical. +-if sys.platform != 'sunos5': +- env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) ++env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) + + LIBNAME = 'libserf-%d' % (MAJOR,) + if sys.platform != 'win32': +@@ -257,7 +257,6 @@ if sys.platform != 'win32': env.Append(CCFLAGS=['-g']) env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) else: @@ -30,7 +41,7 @@ Don't append -O2 compiler flag. env.Append(CPPDEFINES=['NDEBUG']) ### works for Mac OS. probably needs to change -@@ -391,6 +391,11 @@ if sys.platform == 'win32': +@@ -391,6 +390,11 @@ if sys.platform == 'win32': for d in env['LIBPATH']: env.Append(RPATH=':'+d) @@ -42,7 +53,7 @@ Don't append -O2 compiler flag. # Set up the construction of serf-*.pc pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), env.File('build/serf.pc.in'), -@@ -429,7 +434,7 @@ if sys.platform == 'darwin': +@@ -429,7 +433,7 @@ if sys.platform == 'darwin': # make applications depend on the exact major.minor.patch version of serf. install_shared_path = install_shared[0].abspath |