Drop the patch to disable strip instead set the env variable. set UJSON_BUILD_NO_STRIP=1 and get rid of one pending patch
Signed-off-by: Khem Raj <[email protected]> --- ...up.py-Do-not-strip-debugging-symbols.patch | 37 ------------------- .../python/python3-ujson_5.10.0.bb | 10 +++-- 2 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch diff --git a/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch b/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch deleted file mode 100644 index 8ba8ada556..0000000000 --- a/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aec3b64b0aaea0178b44ea65a204d76696e6a45e Mon Sep 17 00:00:00 2001 -From: Leon Anavi <[email protected]> -Date: Mon, 10 Jan 2022 14:04:28 +0200 -Subject: [PATCH] setup.py: Do not strip debugging symbols - -Do not strip debugging symbols from Linux binaries to avoid -bitbake build errors related to already-stripped. - -Signed-off-by: Leon Anavi <[email protected]> ---- -Upstream-Status: Pending - - setup.py | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/setup.py b/setup.py -index b98963b..d42f07a 100644 ---- a/setup.py -+++ b/setup.py -@@ -19,13 +19,7 @@ if not dconv_libs: - dconv_source_files.extend(glob("./deps/double-conversion/double-conversion/*.cc")) - dconv_source_files.append("./lib/dconv_wrapper.cc") - --if platform.system() == "Linux" and environ.get("UJSON_BUILD_NO_STRIP", "0") not in ( -- "1", -- "True", --): -- strip_flags = ["-Wl,--strip-all"] --else: -- strip_flags = [] -+strip_flags = [] - - module1 = Extension( - "ujson", --- -2.25.1 - diff --git a/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb index c64c800626..80b5e6207c 100644 --- a/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb +++ b/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb @@ -6,15 +6,17 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5 SRC_URI[sha256sum] = "b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86ad4bc1" -inherit pypi ptest setuptools3 +inherit pypi ptest python_setuptools_build_meta + +# let OE do the strip operation +export UJSON_BUILD_NO_STRIP = "1" + +DEPENDS += "python3-setuptools-scm-native" SRC_URI += " \ file://run-ptest \ - file://0001-setup.py-Do-not-strip-debugging-symbols.patch \ " -DEPENDS += "python3-setuptools-scm-native" - RDEPENDS:${PN} += "\ python3-datetime \ python3-numbers \
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#112312): https://lists.openembedded.org/g/openembedded-devel/message/112312 Mute This Topic: https://lists.openembedded.org/mt/108468725/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
