From 9ff71c3b4524daee70b664aaeafb864ea532703f Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Mon, 12 Mar 2012 22:24:11 +0100 Subject: python-native: distutils: don't use libdir, remove dead code path * Coming from OE-classic it was surprising that python-native now requires 'libdir' to be exported. Otherwise autoconf would fail to detect python libraries. This happend using a customized environment setup script to use OE's compiler and libs without bitbake. * Use STAGING_LIBDIR instead of libdir. * While at it, remove redundant 'and' statments. (From OE-Core rev: 2edc929c47ac90eabad74e3726912fb3a57aaecd) Signed-off-by: Andreas Oberritter Signed-off-by: Richard Purdie --- .../python-native/12-distutils-prefix-is-inside-staging-area.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/python') diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch index b46caf64fe..f89aaff7b1 100644 --- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch +++ b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch @@ -30,13 +30,13 @@ Upstream-Status: Inappropriate [embedded specific] If 'prefix' is supplied, use it instead of sys.prefix or sys.exec_prefix -- i.e., ignore 'plat_specific'. """ -+ lib_basename = os.getenv("libdir").split('/')[-1] ++ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] if prefix is None: - prefix = plat_specific and EXEC_PREFIX or PREFIX + if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip(lib_basename) ++ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) + else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX ++ prefix = PREFIX if os.name == "posix": libpython = os.path.join(prefix, -- cgit v1.2.3-54-g00ecf