1From 989addc0ca7be8233b413d42704c5dc900e85d81 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/ -name \*ldb\*
12/usr/lib/pkgconfig/pyldb-util.cpython-310-x86_64-linux-gnu.pc
13/usr/lib/pkgconfig/ldb.pc
14/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2.3.2
15/usr/lib/libldb.so.2.3.2
16/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2
17/usr/lib/libldb.so
18/usr/lib/libldb.so.2
19/usr/lib/python3.10/site-packages/_ldb_text.py
20/usr/lib/python3.10/site-packages/ldb.cpython-310-x86_64-linux-gnu.so
21/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so
22
23Set pyext_PATTERN to '%s.so' to remove the suffix.
24After the patch:
25root@qemuarm64:~# find /usr/lib/ -name \*ldb\*
26/usr/lib/pkgconfig/pyldb-util.pc
27/usr/lib/pkgconfig/ldb.pc
28/usr/lib/libpyldb-util.so.2.3.2
29/usr/lib/libldb.so.2.3.2
30/usr/lib/libpyldb-util.so.2
31/usr/lib/libldb.so
32/usr/lib/libldb.so.2
33/usr/lib/python3.10/site-packages/_ldb_text.py
34/usr/lib/python3.10/site-packages/ldb.so
35/usr/lib/libpyldb-util.so
36
37Upstream-Status: Inappropriate [embedded specific]
38
39Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
40---
41 third_party/waf/waflib/Tools/python.py | 2 +-
42 1 file changed, 1 insertion(+), 1 deletion(-)
43
44diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
45index b2dd1a9..2bd3545 100644
46--- a/third_party/waf/waflib/Tools/python.py
47+++ b/third_party/waf/waflib/Tools/python.py
48@@ -339,7 +339,7 @@ def check_python_headers(conf, features='pyembed pyext'):
49 	x = 'MACOSX_DEPLOYMENT_TARGET'
50 	if dct[x]:
51 		env[x] = conf.environ[x] = str(dct[x])
52-	env.pyext_PATTERN = '%s' + (dct['EXT_SUFFIX'] or dct['SO']) # SO is deprecated in 3.5 and removed in 3.11
53+	env.pyext_PATTERN = '%s.so'
54
55
56 	# Try to get pythonX.Y-config
57--
582.25.1
59
60