Change recipes that depend on python3-cython-native to inherit cython instead.
Signed-off-by: Ross Burton <[email protected]> --- .../python/python3-cython_3.0.11.bb | 32 +++---------------- .../python/python3-numpy_1.26.4.bb | 4 +-- .../python/python3-pyyaml_6.0.2.bb | 4 +-- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/meta/recipes-devtools/python/python3-cython_3.0.11.bb b/meta/recipes-devtools/python/python3-cython_3.0.11.bb index efce67d0921..020a8e7205c 100644 --- a/meta/recipes-devtools/python/python3-cython_3.0.11.bb +++ b/meta/recipes-devtools/python/python3-cython_3.0.11.bb @@ -10,42 +10,20 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=61c3ee8961575861fa86c7e62bc9f69c" SRC_URI += "file://0001-WIP-prefix-map.patch" SRC_URI[sha256sum] = "7146dd2af8682b4ca61331851e6aebce9fe5158e75300343f80c07ca80b1faff" -inherit pypi setuptools3 -UPSTREAM_CHECK_PYPI_PACKAGE = "Cython" +inherit pypi setuptools3 cython -do_install:append() { - # Make sure we use /usr/bin/env python3 - for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do - sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT - done +# No need to depend on self +DEPENDS:remove = "python3-cython-native" - # remove build paths from generated sources - sed -i -e 's|${WORKDIR}||' ${S}/Cython/*.c ${S}/Cython/Compiler/*.c ${S}/Cython/Plex/*.c +UPSTREAM_CHECK_PYPI_PACKAGE = "Cython" +do_install:append() { # rename scripts that would conflict with the Python 2 build of Cython mv ${D}${bindir}/cython ${D}${bindir}/cython3 mv ${D}${bindir}/cythonize ${D}${bindir}/cythonize3 mv ${D}${bindir}/cygdb ${D}${bindir}/cygdb3 } -PACKAGESPLITFUNCS =+ "cython_fix_sources" - -cython_fix_sources () { - for f in ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Compiler/FlowControl.c \ - ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Compiler/FusedNode.c \ - ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Compiler/Scanning.c \ - ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Compiler/Visitor.c \ - ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Plex/Actions.c \ - ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Plex/Scanners.c \ - ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Runtime/refnanny.c \ - ${PKGD}${TARGET_DBGSRC_DIR}/Cython/Tempita/_tempita.c \ - ${PKGD}${libdir}/${PYTHON_DIR}/site-packages/Cython*/SOURCES.txt; do - if [ -e $f ]; then - sed -i -e 's#${WORKDIR}/cython-${PV}#${TARGET_DBGSRC_DIR}#g' $f - fi - done -} - RDEPENDS:${PN}:class-target += "\ python3-misc \ python3-netserver \ diff --git a/meta/recipes-devtools/python/python3-numpy_1.26.4.bb b/meta/recipes-devtools/python/python3-numpy_1.26.4.bb index 914245507c7..fa78b07f48b 100644 --- a/meta/recipes-devtools/python/python3-numpy_1.26.4.bb +++ b/meta/recipes-devtools/python/python3-numpy_1.26.4.bb @@ -18,9 +18,7 @@ SRC_URI[sha256sum] = "2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4 GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases"; UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" -DEPENDS += "python3-cython-native" - -inherit ptest setuptools3 github-releases +inherit ptest setuptools3 github-releases cython S = "${WORKDIR}/numpy-${PV}" diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb index 10e61274b07..9f9320a5949 100644 --- a/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb +++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb @@ -4,8 +4,6 @@ HOMEPAGE = "https://pyyaml.org/"; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6d8242660a8371add5fe547adf083079" -DEPENDS += "python3-cython-native" - SRC_URI[sha256sum] = "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e" SRC_URI += "\ @@ -16,7 +14,7 @@ SRC_URI[test.sha256sum] = "b6a8a2825d89fdc8aee226560f66b8196e872012a0ea7118cbef1 UPSTREAM_CHECK_PYPI_PACKAGE = "PyYAML" -inherit pypi python_setuptools_build_meta ptest +inherit pypi python_setuptools_build_meta ptest cython PACKAGECONFIG ?= "libyaml" PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#206866): https://lists.openembedded.org/g/openembedded-core/message/206866 Mute This Topic: https://lists.openembedded.org/mt/109461788/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
