diff options
| author | adam <adam@pkgsrc.org> | 2014-05-20 16:48:00 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2014-05-20 16:48:00 +0000 |
| commit | 75168fab01b398bf10a2ff49d45ef430cadeafdc (patch) | |
| tree | 6a55d236501634f377eb7be71446762c0a850563 /lang/python27 | |
| parent | c551aef239b01668faebb01583270996f2005bb1 (diff) | |
| download | pkgsrc-75168fab01b398bf10a2ff49d45ef430cadeafdc.tar.gz | |
Fix detecting OpenSSL, in particular on OS X.
Diffstat (limited to 'lang/python27')
| -rw-r--r-- | lang/python27/distinfo | 4 | ||||
| -rw-r--r-- | lang/python27/patches/patch-am | 18 |
2 files changed, 5 insertions, 17 deletions
diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 7e85d0a9443..23cf5a115ca 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2014/05/10 08:38:04 obache Exp $ +$NetBSD: distinfo,v 1.38 2014/05/20 16:48:00 adam Exp $ SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80 RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a @@ -16,7 +16,7 @@ SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139 SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925 -SHA1 (patch-am) = 801c8fbe14be2138ef45f2d80646d8be6d4ea25a +SHA1 (patch-am) = 4a1fb4f30d27463587901f5cf40adfc7b9c5904a SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1 SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66 diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am index 4ecbadfc6be..a0471b6ba15 100644 --- a/lang/python27/patches/patch-am +++ b/lang/python27/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.15 2014/04/13 15:06:20 bsiegert Exp $ +$NetBSD: patch-am,v 1.16 2014/05/20 16:48:00 adam Exp $ Disabled modules for normal build: bsddb @@ -63,7 +63,7 @@ cygwin 2.7.3-no-libm.patch math_libs = [] # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -785,10 +790,9 @@ class PyBuildExt(build_ext): +@@ -785,8 +790,7 @@ class PyBuildExt(build_ext): libraries=math_libs) ) # Detect SSL support for the socket module (via _ssl) search_for_ssl_incs_in = [ @@ -71,11 +71,8 @@ cygwin 2.7.3-no-libm.patch - '/usr/contrib/ssl/include/' + '@SSLBASE@/include' ] -- ssl_incs = find_file('openssl/ssl.h', inc_dirs, -+ ssl_incs = find_file('openssl/ssl.h', [], + ssl_incs = find_file('openssl/ssl.h', inc_dirs, search_for_ssl_incs_in - ) - if ssl_incs is not None: @@ -797,9 +801,7 @@ class PyBuildExt(build_ext): if krb5_h: ssl_incs += krb5_h @@ -87,15 +84,6 @@ cygwin 2.7.3-no-libm.patch if (ssl_incs is not None and ssl_libs is not None): -@@ -818,7 +820,7 @@ class PyBuildExt(build_ext): - - # look for the openssl version header on the compiler search path. - opensslv_h = find_file('openssl/opensslv.h', [], -- inc_dirs + search_for_ssl_incs_in) -+ search_for_ssl_incs_in) - if opensslv_h: - name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') - if host_platform == 'darwin' and is_macosx_sdk_path(name): @@ -918,175 +920,6 @@ class PyBuildExt(build_ext): else: raise ValueError("unknown major BerkeleyDB version", major) |