diff options
Diffstat (limited to 'meta/recipes-devtools/python/python3')
-rw-r--r-- | meta/recipes-devtools/python/python3/fix_ssl_include_dir.patch | 41 |
1 files changed, 41 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 @@ | |||
1 | Upstream-Status: Inappropriate [Embedded Specific] | ||
2 | |||
3 | Python 3 fails to compile the ssl module, later, when requesting to install packages that should include such modules | ||
4 | no error is shown; but a running python shell trying to import the ssl library results in an import error, | ||
5 | since it was never installed. | ||
6 | |||
7 | This looks for the modules in the correct directories so they are corretcly compiled and installed along with python3. | ||
8 | |||
9 | ImportError: No module named _ssl | ||
10 | |||
11 | Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
12 | |||
13 | Index: 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): | ||