blob: 47ee4bb24eb7ea0a97827dd9d932da8698b80576 [file] [log] [blame]
Andrew Geissler595f6302022-01-24 19:11:47 +00001From b5eaeb7ed4e75012d2715f995e15a13850064f61 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 \*talloc\*
12/usr/lib/pkgconfig/talloc.pc
13/usr/lib/pkgconfig/pytalloc-util.cpython-310-x86_64-linux-gnu.pc
14/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3
15/usr/lib/libtalloc.so.2
16/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2
17/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so
18/usr/lib/libtalloc.so
19/usr/lib/libtalloc.so.2.3.3
20/usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so
21
22Set pyext_PATTERN to '%s.so' to remove the suffix.
23After the patch:
24root@qemuarm64:~# find /usr/lib -name \*talloc\*
25/usr/lib/pkgconfig/talloc.pc
26/usr/lib/pkgconfig/pytalloc-util.pc
27/usr/lib/libpytalloc-util.so.2.3.3
28/usr/lib/libtalloc.so.2
29/usr/lib/libpytalloc-util.so.2
30/usr/lib/libpytalloc-util.so
31/usr/lib/libtalloc.so
32/usr/lib/libtalloc.so.2.3.3
33/usr/lib/python3.10/site-packages/talloc.so
34
35Upstream-Status: Inappropriate [embedded specific]
36
37Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
38---
39 third_party/waf/waflib/Tools/python.py | 2 +-
40 1 file changed, 1 insertion(+), 1 deletion(-)
41
42diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py
43index b1c8dd0..24faa31 100644
44--- a/third_party/waf/waflib/Tools/python.py
45+++ b/third_party/waf/waflib/Tools/python.py
46@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'):
47 x = 'MACOSX_DEPLOYMENT_TARGET'
48 if dct[x]:
49 env[x] = conf.environ[x] = dct[x]
50- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake
51+ env.pyext_PATTERN = '%s.so'
52
53
54 # Try to get pythonX.Y-config
55--
562.17.1
57