Skip to contentSkip to conversation

cython: swap prefix-mapping patch for an upstream commit

PATCH New Ross Burton 1 participant 1 message Nov 19, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cython: swap prefix-mapping patch for an upstream commit

Upstream has solved the absolute path problem differently by taking paths relative to the top of the module. This appears to solve the problem, at least I've not found any cases where it breaks.

Drop my patch, and backport the relevant commit from upstream.

---
 meta/classes-recipe/cython.bbclass            |   3 -
 ...lative-paths-in-generated-C-code.-GH.patch |  73 +++++++++
 .../python3-cython/0001-WIP-prefix-map.patch  | 148 ------------------
 .../python/python3-cython_3.0.11.bb           |   2 +-
 4 files changed, 74 insertions(+), 152 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python3-cython/0001-Output-import-relative-paths-in-generated-C-code.-GH.patch
 delete mode 100644 meta/recipes-devtools/python/python3-cython/0001-WIP-prefix-map.patch
meta/classes-recipe/cython.bbclass +0 -3
index 53b84f5f5eb..dd9fc732bcb 100644
@@ -1,8 +1,5 @@
 DEPENDS:append = " python3-cython-native"
 
-# Remap the build paths that appear in generated .c code
-export CYTHON_PREFIX_MAP = "${S}=${TARGET_DBGSRC_DIR} ${B}=${TARGET_DBGSRC_DIR}"
-
 do_compile[postfuncs] = "strip_cython_metadata"
 strip_cython_metadata() {
     # Remove the Cython Metadata headers that we don't need after the build, and
meta/recipes-devtools/python/python3-cython/0001-Output-import-relative-paths-in-generated-C-code.-GH.patch new file +73 -0

73 lines not on this page · raw message

meta/recipes-devtools/python/python3-cython/0001-WIP-prefix-map.patch deleted +0 -148

148 lines not on this page · raw message

meta/recipes-devtools/python/python3-cython_3.0.11.bb +1 -1
index 020a8e7205c..2501e6ed232 100644
@@ -7,7 +7,7 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=61c3ee8961575861fa86c7e62bc9f69c"
 
-SRC_URI += "file://0001-WIP-prefix-map.patch"
+SRC_URI += "file://0001-Output-import-relative-paths-in-generated-C-code.-GH.patch"
 SRC_URI[sha256sum] = "7146dd2af8682b4ca61331851e6aebce9fe5158e75300343f80c07ca80b1faff"
 
 inherit pypi setuptools3 cython
Signature · 1 line
2.34.1