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>
This commit is contained in:
Alejandro Hernandez 2015-05-14 16:43:24 +00:00 committed by Richard Purdie
parent 3b1f6871d3
commit ae67f744a5
2 changed files with 42 additions and 0 deletions

View File

@ -0,0 +1,41 @@
Upstream-Status: Inappropriate [Embedded Specific]
Python 3 fails to compile the ssl module, later, when requesting to install packages that should include such modules
no error is shown; but a running python shell trying to import the ssl library results in an import error,
since it was never installed.
This looks for the modules in the correct directories so they are corretcly compiled and installed along with python3.
ImportError: No module named _ssl
Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Index: Python-3.4.3/setup.py
===================================================================
--- Python-3.4.3.orig/setup.py
+++ Python-3.4.3/setup.py
@@ -726,10 +726,9 @@ class PyBuildExt(build_ext):
exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl)
- search_for_ssl_incs_in = [
- '/usr/local/ssl/include',
- '/usr/contrib/ssl/include/'
- ]
+ search_for_ssl_incs_in = []
+ for dir in [os.getenv("STAGING_INCDIR")]:
+ search_for_ssl_incs_in.append(dir)
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
search_for_ssl_incs_in
)
@@ -739,9 +738,7 @@ class PyBuildExt(build_ext):
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib',
- '/usr/contrib/ssl/lib/'
- ] )
+ [os.getenv("STAGING_LIBDIR")])
if (ssl_incs is not None and
ssl_libs is not None):

View File

@ -36,6 +36,7 @@ SRC_URI += "\
file://python3-setup.py-no-host-headers-libs.patch \
file://sysconfig.py-add-_PYTHON_PROJECT_SRC.patch \
file://setup.py-check-cross_compiling-when-get-FLAGS.patch \
file://fix_ssl_include_dir.patch \
"
SRC_URI[md5sum] = "7d092d1bba6e17f0d9bd21b49e441dd5"
SRC_URI[sha256sum] = "b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8"