diff options
-rw-r--r-- | meta/recipes-devtools/python/python-native/12-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 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] | |||
30 | If 'prefix' is supplied, use it instead of sys.prefix or | 30 | If 'prefix' is supplied, use it instead of sys.prefix or |
31 | sys.exec_prefix -- i.e., ignore 'plat_specific'. | 31 | sys.exec_prefix -- i.e., ignore 'plat_specific'. |
32 | """ | 32 | """ |
33 | + lib_basename = os.getenv("libdir").split('/')[-1] | 33 | + lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1] |
34 | if prefix is None: | 34 | if prefix is None: |
35 | - prefix = plat_specific and EXEC_PREFIX or PREFIX | 35 | - prefix = plat_specific and EXEC_PREFIX or PREFIX |
36 | + if plat_specific: | 36 | + if plat_specific: |
37 | + prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip(lib_basename) | 37 | + prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename) |
38 | + else: | 38 | + else: |
39 | + prefix = plat_specific and EXEC_PREFIX or PREFIX | 39 | + prefix = PREFIX |
40 | 40 | ||
41 | if os.name == "posix": | 41 | if os.name == "posix": |
42 | libpython = os.path.join(prefix, | 42 | libpython = os.path.join(prefix, |