summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2015-05-14 16:43:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:34:04 +0100
commitae67f744a512b86eb145ed9da525a11d2f67ece9 (patch)
treee1d761cbfd9f26445cef0b5b824b31af07a5e8ec /meta/recipes-devtools/python
parent3b1f6871d31cd8694e22cef0f1b61f642ed1b158 (diff)
downloadpoky-ae67f744a512b86eb145ed9da525a11d2f67ece9.tar.gz
python3-io: Fixes compilation of python3 ssl module
During python3 compilation, the module ssl was being skippped due to the fact that the compilation script couldnt find the required files, this patch fixes setup.py so it looks for the files in the correct directory, hence fixing its compilation and installation. [YOCTO #7768] (From OE-Core rev: 4cffb16b0edc353d4a3287ca59ba02640f605d2b) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch41
-rw-r--r--meta/recipes-devtools/python/python3_3.4.3.bb1
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch b/meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch
new file mode 100644
index 0000000000..9972829c78
--- /dev/null
+++ b/meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch
@@ -0,0 +1,41 @@
1Upstream-Status: Inappropriate [Embedded Specific]
2
3Python 3 fails to compile the ssl module, later, when requesting to install packages that should include such modules
4no error is shown; but a running python shell trying to import the ssl library results in an import error,
5since it was never installed.
6
7This looks for the modules in the correct directories so they are corretcly compiled and installed along with python3.
8
9ImportError: No module named _ssl
10
11Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
12
13Index: Python-3.4.3/setup.py
14===================================================================
15--- Python-3.4.3.orig/setup.py
16+++ Python-3.4.3/setup.py
17@@ -726,10 +726,9 @@ class PyBuildExt(build_ext):
18 exts.append( Extension('_socket', ['socketmodule.c'],
19 depends = ['socketmodule.h']) )
20 # Detect SSL support for the socket module (via _ssl)
21- search_for_ssl_incs_in = [
22- '/usr/local/ssl/include',
23- '/usr/contrib/ssl/include/'
24- ]
25+ search_for_ssl_incs_in = []
26+ for dir in [os.getenv("STAGING_INCDIR")]:
27+ search_for_ssl_incs_in.append(dir)
28 ssl_incs = find_file('openssl/ssl.h', inc_dirs,
29 search_for_ssl_incs_in
30 )
31@@ -739,9 +738,7 @@ class PyBuildExt(build_ext):
32 if krb5_h:
33 ssl_incs += krb5_h
34 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
35- ['/usr/local/ssl/lib',
36- '/usr/contrib/ssl/lib/'
37- ] )
38+ [os.getenv("STAGING_LIBDIR")])
39
40 if (ssl_incs is not None and
41 ssl_libs is not None):
diff --git a/meta/recipes-devtools/python/python3_3.4.3.bb b/meta/recipes-devtools/python/python3_3.4.3.bb
index 4bab4db81b..8e0c2ba5f0 100644
--- a/meta/recipes-devtools/python/python3_3.4.3.bb
+++ b/meta/recipes-devtools/python/python3_3.4.3.bb
@@ -36,6 +36,7 @@ SRC_URI += "\
36 file://python3-setup.py-no-host-headers-libs.patch \ 36 file://python3-setup.py-no-host-headers-libs.patch \
37 file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \ 37 file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
38 file://setup.py-check-cross_compiling-when-get-FLAGS.patch \ 38 file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
39 file://fix_ssl_include_dir.patch \
39 " 40 "
40SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5" 41SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5"
41SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8" 42SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8"