From 3639c6a19b2ba8f492e682595e5ac235ec9817ea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 23 Apr 2012 22:46:42 +0100 Subject: python: Fix various contamination issues leading to broken/missing c modules The move of libcrypto to /lib instead of /usr/lib has broken the _hashlib module compilation. There were also a number of other failing modules which should have been building correctly. This turned out partly to be the /lib issue but also due to a number of native paths creeping into compiler commandlines. These changes add in /lib as part of the searh directory and remove a number of host contamination issues within setup.py. Post release we should really further go through this file and just delete large sections of it as its hard to be sure what strange paths python is injecting as search paths. This patch also fixes issues where re-execution of the compile task would corrupt the Makefile in various ways, again leading to puzzling paths within the configuration. (From OE-Core rev: 20e2761e1da1cb5dcd267e161f2a6b6a429e9f39) Signed-off-by: Richard Purdie --- .../python/python/01-use-proper-tools-for-cross-build.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch') diff --git a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch index 27afc030b2..691beada03 100644 --- a/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch +++ b/meta/recipes-devtools/python/python/01-use-proper-tools-for-cross-build.patch @@ -119,8 +119,8 @@ Index: Python-2.7.2/setup.py # XXX Omitted modules: gl, pure, dl, SGI-specific modules -+ lib_dirs = [ os.getenv( "STAGING_LIBDIR" ) ] -+ inc_dirs = [ os.getenv( "STAGING_INCDIR" ) ] ++ lib_dirs = [ os.getenv("STAGING_LIBDIR"), os.getenv("STAGING_BASELIBDIR") ] ++ inc_dirs = [ os.getenv("STAGING_INCDIR") ] + # # The following modules are all pretty straightforward, and compile -- cgit v1.2.3-54-g00ecf