summaryrefslogtreecommitdiff
path: root/lang/python34
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2014-05-10 04:32:36 +0000
committerobache <obache@pkgsrc.org>2014-05-10 04:32:36 +0000
commit361836cfcf7c006363dadd089789607a516f9555 (patch)
tree20de85b354eb2cf6420c9fd1178a5edd81c5ad79 /lang/python34
parent4a9aca174333696100b7f7141f094809298c482d (diff)
downloadpkgsrc-361836cfcf7c006363dadd089789607a516f9555.tar.gz
fixes again, for the case pkgsrc openssl is prefered than builtin old openssl.
Diffstat (limited to 'lang/python34')
-rw-r--r--lang/python34/distinfo4
-rw-r--r--lang/python34/patches/patch-am11
2 files changed, 12 insertions, 3 deletions
diff --git a/lang/python34/distinfo b/lang/python34/distinfo
index a18d73d770e..5f585e57dd1 100644
--- a/lang/python34/distinfo
+++ b/lang/python34/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2014/05/09 16:33:56 adam Exp $
+$NetBSD: distinfo,v 1.5 2014/05/10 04:35:55 obache Exp $
SHA1 (Python-3.4.0.tar.xz) = f54d7cf6af5dbd9bddbe31cf4772f39711381dbe
RMD160 (Python-3.4.0.tar.xz) = f6b4664a4333a2010f8e168e252de7c22013e4a8
@@ -7,7 +7,7 @@ SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e08153
SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d
SHA1 (patch-ah) = b3a1363f6d210f855f3769650e3891b0df5c531d
SHA1 (patch-al) = 0944fb5b807985723070ac44358505c3053f9997
-SHA1 (patch-am) = 93bc44af2ae5a477c73adc49600280fd07014bd8
+SHA1 (patch-am) = 3ccd51ecd8cae9577c66e4936fda5ac615223da6
SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
SHA1 (patch-ao) = bc7bb76ca7b3b8302dd966fad85171236c1f06e6
SHA1 (patch-au) = 6e10e6fc484317447bdeaa833db5df073df98c5b
diff --git a/lang/python34/patches/patch-am b/lang/python34/patches/patch-am
index 1c34da64483..65ca05a3df5 100644
--- a/lang/python34/patches/patch-am
+++ b/lang/python34/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2014/05/09 16:33:56 adam Exp $
+$NetBSD: patch-am,v 1.4 2014/05/10 04:35:55 obache Exp $
--- setup.py.orig 2014-03-17 02:31:31.000000000 +0000
+++ setup.py
@@ -58,6 +58,15 @@ $NetBSD: patch-am,v 1.3 2014/05/09 16:33:56 adam Exp $
if (ssl_incs is not None and
ssl_libs is not None):
+@@ -784,7 +782,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, + inc_dirs)
+ if opensslv_h:
+ name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
+ if host_platform == 'darwin' and is_macosx_sdk_path(name):
@@ -1148,6 +1146,30 @@ class PyBuildExt(build_ext):
dbm_order = ['gdbm']
# The standard Unix dbm module: