| From da1dc659fd351ff6283f843eeba5e0b3f7b2d584 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/python3.10/ -name \*tevent\*.so |
| /usr/lib/python3.10/site-packages/_tevent.cpython-310-x86_64-linux-gnu.so |
| /usr/lib/python3.10/site-packages/_tevent.so |
| |
| Set pyext_PATTERN to '%s.so' to remove the suffix. |
| After the patch: |
| root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so |
| /usr/lib/python3.10/site-packages/_tevent.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 a23bd01..af202e0 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] = str(dct[x]) |
| - env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11 |
| + env.pyext_PATTERN = '%s.so' |
| |
| |
| # Try to get pythonX.Y-config |
| -- |
| 2.25.1 |
| |