diff options
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch | 37 | ||||
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb | 8 |
2 files changed, 5 insertions, 40 deletions
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 @@ | |||
| 1 | From aec3b64b0aaea0178b44ea65a204d76696e6a45e Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Leon Anavi <leon.anavi@konsulko.com> | ||
| 3 | Date: Mon, 10 Jan 2022 14:04:28 +0200 | ||
| 4 | Subject: [PATCH] setup.py: Do not strip debugging symbols | ||
| 5 | |||
| 6 | Do not strip debugging symbols from Linux binaries to avoid | ||
| 7 | bitbake build errors related to already-stripped. | ||
| 8 | |||
| 9 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
| 10 | --- | ||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | setup.py | 8 +------- | ||
| 14 | 1 file changed, 1 insertion(+), 7 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/setup.py b/setup.py | ||
| 17 | index b98963b..d42f07a 100644 | ||
| 18 | --- a/setup.py | ||
| 19 | +++ b/setup.py | ||
| 20 | @@ -19,13 +19,7 @@ if not dconv_libs: | ||
| 21 | dconv_source_files.extend(glob("./deps/double-conversion/double-conversion/*.cc")) | ||
| 22 | dconv_source_files.append("./lib/dconv_wrapper.cc") | ||
| 23 | |||
| 24 | -if platform.system() == "Linux" and environ.get("UJSON_BUILD_NO_STRIP", "0") not in ( | ||
| 25 | - "1", | ||
| 26 | - "True", | ||
| 27 | -): | ||
| 28 | - strip_flags = ["-Wl,--strip-all"] | ||
| 29 | -else: | ||
| 30 | - strip_flags = [] | ||
| 31 | +strip_flags = [] | ||
| 32 | |||
| 33 | module1 = Extension( | ||
| 34 | "ujson", | ||
| 35 | -- | ||
| 36 | 2.25.1 | ||
| 37 | |||
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..18ce5cc301 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 | |||
| @@ -8,13 +8,15 @@ SRC_URI[sha256sum] = "b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86 | |||
| 8 | 8 | ||
| 9 | inherit pypi ptest setuptools3 | 9 | inherit pypi ptest setuptools3 |
| 10 | 10 | ||
| 11 | # let OE do the strip operation | ||
| 12 | export UJSON_BUILD_NO_STRIP = "1" | ||
| 13 | |||
| 14 | DEPENDS += "python3-setuptools-scm-native" | ||
| 15 | |||
| 11 | SRC_URI += " \ | 16 | SRC_URI += " \ |
| 12 | file://run-ptest \ | 17 | file://run-ptest \ |
| 13 | file://0001-setup.py-Do-not-strip-debugging-symbols.patch \ | ||
| 14 | " | 18 | " |
| 15 | 19 | ||
| 16 | DEPENDS += "python3-setuptools-scm-native" | ||
| 17 | |||
| 18 | RDEPENDS:${PN} += "\ | 20 | RDEPENDS:${PN} += "\ |
| 19 | python3-datetime \ | 21 | python3-datetime \ |
| 20 | python3-numbers \ | 22 | python3-numbers \ |
