diff options
Diffstat (limited to 'meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch')
-rw-r--r-- | meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 0000000000..71934795b1 --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb/0003-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,59 @@ +From 989addc0ca7be8233b413d42704c5dc900e85d81 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 \*ldb\* +/usr/lib/pkgconfig/pyldb-util.cpython-310-x86_64-linux-gnu.pc +/usr/lib/pkgconfig/ldb.pc +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2.3.2 +/usr/lib/libldb.so.2.3.2 +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2 +/usr/lib/libldb.so +/usr/lib/libldb.so.2 +/usr/lib/python3.10/site-packages/_ldb_text.py +/usr/lib/python3.10/site-packages/ldb.cpython-310-x86_64-linux-gnu.so +/usr/lib/libpyldb-util.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 \*ldb\* +/usr/lib/pkgconfig/pyldb-util.pc +/usr/lib/pkgconfig/ldb.pc +/usr/lib/libpyldb-util.so.2.3.2 +/usr/lib/libldb.so.2.3.2 +/usr/lib/libpyldb-util.so.2 +/usr/lib/libldb.so +/usr/lib/libldb.so.2 +/usr/lib/python3.10/site-packages/_ldb_text.py +/usr/lib/python3.10/site-packages/ldb.so +/usr/lib/libpyldb-util.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 b2dd1a9..2bd3545 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -339,7 +339,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 + |