From patchwork Tue Mar 13 07:58:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 22/23] python-native: distutils: don't use libdir, remove dead code path Date: Tue, 13 Mar 2012 07:58:56 -0000 From: Saul Wold X-Patchwork-Id: 23123 Message-Id: <2d83b339a4dd23b2f6a268795dfa7e676b47dc55.1331589797.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Andreas Oberritter * 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. Signed-off-by: Andreas Oberritter --- ...2-distutils-prefix-is-inside-staging-area.patch | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) 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 b46caf6..f89aaff 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,