1From da1dc659fd351ff6283f843eeba5e0b3f7b2d584 Mon Sep 17 00:00:00 2001 2From: Yi Zhao <yi.zhao@windriver.com> 3Date: Wed, 24 Nov 2021 13:33:35 +0800 4Subject: [PATCH] Fix pyext_PATTERN for cross compilation 5 6The pyext_PATTERN will add native arch as suffix when cross compiling. 7For example, on qemuarm64, it is expanded to: 8pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' 9which will result in the incorrect library name. 10 11root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so 12/usr/lib/python3.10/site-packages/_tevent.cpython-310-x86_64-linux-gnu.so 13/usr/lib/python3.10/site-packages/_tevent.so 14 15Set pyext_PATTERN to '%s.so' to remove the suffix. 16After the patch: 17root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so 18/usr/lib/python3.10/site-packages/_tevent.so 19 20Upstream-Status: Inappropriate [embedded specific] 21 22Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 23--- 24 third_party/waf/waflib/Tools/python.py | 2 +- 25 1 file changed, 1 insertion(+), 1 deletion(-) 26 27diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py 28index a23bd01..af202e0 100644 29--- a/third_party/waf/waflib/Tools/python.py 30+++ b/third_party/waf/waflib/Tools/python.py 31@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): 32 x = 'MACOSX_DEPLOYMENT_TARGET' 33 if dct[x]: 34 env[x] = conf.environ[x] = str(dct[x]) 35- env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 36+ env.pyext_PATTERN = '%s.so' 37 38 39 # Try to get pythonX.Y-config 40-- 412.25.1 42 43