diff options
Diffstat (limited to 'meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch deleted file mode 100644 index d497dd32ca..0000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a0547cacaddcb2fbef1fb9991c5ad522226e6817 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 \*cpython\* -/usr/lib/pkgconfig/samba-policy.cpython-310-x86_64-linux-gnu.pc -/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so -/usr/lib/samba/libsamba-python.cpython-310-x86-64-linux-gnu-samba4.so -/usr/lib/samba/libsamba-net.cpython-310-x86-64-linux-gnu-samba4.so -/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0 -/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1 -/usr/lib/python3.10/site-packages/samba/dsdb_dns.cpython-310-x86_64-linux-gnu.so -/usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so -/usr/lib/python3.10/site-packages/samba/xattr_tdb.cpython-310-x86_64-linux-gnu.so -/usr/lib/python3.10/site-packages/samba/_ldb.cpython-310-x86_64-linux-gnu.so -/usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so -[snip] - -Set pyext_PATTERN to '%s.so' to remove the suffix. -After the patch: -root@qemuarm64:~# find /usr/lib/ -/usr/lib/pkgconfig/samba-policy.pc -/usr/lib/libsamba-policy.so -/usr/lib/samba/libsamba-python-samba4.so -/usr/lib/samba/libsamba-net-samba4.so -/usr/lib/libsamba-policy.so.0 -/usr/lib/libsamba-policy.so.0.0.1 -/usr/lib/python3.10/site-packages/samba/dsdb_dns.so -/usr/lib/python3.10/site-packages/samba/dsdb.so -/usr/lib/python3.10/site-packages/samba/xattr_tdb.so -/usr/lib/python3.10/site-packages/samba/_ldb.so -/usr/lib/python3.10/site-packages/samba/gensec.so -[snip] - -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 b1c8dd0..24faa31 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] = dct[x] -- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake -+ env.pyext_PATTERN = '%s.so' - - - # Try to get pythonX.Y-config --- -2.17.1 - |