mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-09-04 13:14:40 +02:00
13187d3f01
The pyext_PATTERN will add native arch as suffix when cross compiling. For example, on qemuarm64, it is expanded to: pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' which will result in the incorrect library name. root@qemuarm64:~# find /usr/lib -name \*talloc\* /usr/lib/pkgconfig/talloc.pc /usr/lib/pkgconfig/pytalloc-util.cpython-310-x86_64-linux-gnu.pc /usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3 /usr/lib/libtalloc.so.2 /usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2 /usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so /usr/lib/libtalloc.so /usr/lib/libtalloc.so.2.3.3 /usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so Set pyext_PATTERN to '%s.so' to remove the suffix. After the patch: root@qemuarm64:~# find /usr/lib -name \*talloc\* /usr/lib/pkgconfig/talloc.pc /usr/lib/pkgconfig/pytalloc-util.pc /usr/lib/libpytalloc-util.so.2.3.3 /usr/lib/libtalloc.so.2 /usr/lib/libpytalloc-util.so.2 /usr/lib/libpytalloc-util.so /usr/lib/libtalloc.so /usr/lib/libtalloc.so.2.3.3 /usr/lib/python3.10/site-packages/talloc.so Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From b5eaeb7ed4e75012d2715f995e15a13850064f61 Mon Sep 17 00:00:00 2001
|
|
From: Yi Zhao <yi.zhao@windriver.com>
|
|
Date: Wed, 24 Nov 2021 13:33:35 +0800
|
|
Subject: [PATCH] Fix pyext_PATTERN for cross compilation
|
|
|
|
The pyext_PATTERN will add native arch as suffix when cross compiling.
|
|
For example, on qemuarm64, it is expanded to:
|
|
pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so'
|
|
which will result in the incorrect library name.
|
|
|
|
root@qemuarm64:~# find /usr/lib -name \*talloc\*
|
|
/usr/lib/pkgconfig/talloc.pc
|
|
/usr/lib/pkgconfig/pytalloc-util.cpython-310-x86_64-linux-gnu.pc
|
|
/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3
|
|
/usr/lib/libtalloc.so.2
|
|
/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2
|
|
/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so
|
|
/usr/lib/libtalloc.so
|
|
/usr/lib/libtalloc.so.2.3.3
|
|
/usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so
|
|
|
|
Set pyext_PATTERN to '%s.so' to remove the suffix.
|
|
After the patch:
|
|
root@qemuarm64:~# find /usr/lib -name \*talloc\*
|
|
/usr/lib/pkgconfig/talloc.pc
|
|
/usr/lib/pkgconfig/pytalloc-util.pc
|
|
/usr/lib/libpytalloc-util.so.2.3.3
|
|
/usr/lib/libtalloc.so.2
|
|
/usr/lib/libpytalloc-util.so.2
|
|
/usr/lib/libpytalloc-util.so
|
|
/usr/lib/libtalloc.so
|
|
/usr/lib/libtalloc.so.2.3.3
|
|
/usr/lib/python3.10/site-packages/talloc.so
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
third_party/waf/waflib/Tools/python.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
|
|
index b1c8dd0..24faa31 100644
|
|
--- a/third_party/waf/waflib/Tools/python.py
|
|
+++ b/third_party/waf/waflib/Tools/python.py
|
|
@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'):
|
|
x = 'MACOSX_DEPLOYMENT_TARGET'
|
|
if dct[x]:
|
|
env[x] = conf.environ[x] = dct[x]
|
|
- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake
|
|
+ env.pyext_PATTERN = '%s.so'
|
|
|
|
|
|
# Try to get pythonX.Y-config
|
|
--
|
|
2.17.1
|
|
|