From patchwork Thu Nov 7 17:28:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A428D5D674 for ; Thu, 7 Nov 2024 17:29:06 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.77935.1731000545163342831 for ; Thu, 07 Nov 2024 09:29:05 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B97B6497 for ; Thu, 7 Nov 2024 09:29:34 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 746183F6A8 for ; Thu, 7 Nov 2024 09:29:04 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH][meta-python 1/7] python3-systemd: switch to python_setuptools_build_meta Date: Thu, 7 Nov 2024 17:28:56 +0000 Message-Id: <20241107172902.4018835-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Nov 2024 17:29:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113750 Switch to the modern build system, and sort the recipe assignments to be more idiomatic. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-systemd_235.bb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-systemd_235.bb b/meta-python/recipes-devtools/python/python3-systemd_235.bb index 7a7d5a5053..3abea5f5f2 100644 --- a/meta-python/recipes-devtools/python/python3-systemd_235.bb +++ b/meta-python/recipes-devtools/python/python3-systemd_235.bb @@ -3,10 +3,15 @@ HOMEPAGE = "https://github.com/systemd/python-systemd" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" + PYPI_PACKAGE = "systemd-python" -DEPENDS += "systemd (<=235)" -RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog" -REQUIRED_DISTRO_FEATURES = "systemd" -inherit pypi features_check pkgconfig setuptools3 SRC_URI:append:libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" SRC_URI[sha256sum] = "4e57f39797fd5d9e2d22b8806a252d7c0106c936039d1e71c8c6b8008e695c0a" + +DEPENDS += "systemd (<=235)" + +inherit pypi features_check pkgconfig python_setuptools_build_meta + +REQUIRED_DISTRO_FEATURES = "systemd" + +RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog" From patchwork Thu Nov 7 17:28:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52180 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A18CAD5D677 for ; Thu, 7 Nov 2024 17:29:06 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.77936.1731000545907910695 for ; Thu, 07 Nov 2024 09:29:06 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 78A17497 for ; Thu, 7 Nov 2024 09:29:35 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 342B73F6A8 for ; Thu, 7 Nov 2024 09:29:05 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH][meta-python 2/7] python3-gevent: inherit cython class Date: Thu, 7 Nov 2024 17:28:57 +0000 Message-Id: <20241107172902.4018835-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107172902.4018835-1-ross.burton@arm.com> References: <20241107172902.4018835-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Nov 2024 17:29:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113751 Use the new cython class to avoid duplicated fixup code to remove build paths. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-gevent_24.2.1.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb b/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb index e44972178e..9f96b00953 100644 --- a/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb +++ b/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb @@ -4,7 +4,7 @@ a high-level synchronous API on top of the libevent event loop." HOMEPAGE = "http://www.gevent.org" LICENSE = "MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65" -DEPENDS += "python3-greenlet-native python3-greenlet libev libuv python3-cython-native python3-cffi-native" +DEPENDS += "python3-greenlet-native python3-greenlet libev libuv python3-cffi-native" RDEPENDS:${PN} = "python3-greenlet \ python3-mime \ @@ -18,7 +18,7 @@ SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch \ SRC_URI[sha256sum] = "432fc76f680acf7cf188c2ee0f5d3ab73b63c1f03114c7cd8a34cebbe5aa2056" -inherit pypi python_setuptools_build_meta +inherit pypi python_setuptools_build_meta cython # Don't embed libraries, link to the system provided libs instead export GEVENTSETUP_EMBED_CARES = "0" @@ -33,10 +33,6 @@ do_configure:append() { rm -rf ${S}/src/gevent/*.c } -do_compile:append() { - sed -i -e 's#${WORKDIR}##g' ${S}/src/gevent/*.c ${S}/src/gevent/libev/*.c ${S}/src/gevent/resolver/*.c -} - # http://errors.yoctoproject.org/Errors/Details/766918/ # src/gevent/queue.c:11894:83: error: passing argument 1 of '__pyx_vtabptr_6gevent_14_gevent_cqueue_UnboundQueue->__pyx_base.put' from incompatible pointer type [-Wincompatible-pointer-types] # src/gevent/queue.c:11894:114: error: passing argument 4 of '__pyx_vtabptr_6gevent_14_gevent_cqueue_UnboundQueue->__pyx_base.put' from incompatible pointer type [-Wincompatible-pointer-types] From patchwork Thu Nov 7 17:28:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52181 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84933D5D67D for ; Thu, 7 Nov 2024 17:29:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.78174.1731000546682006011 for ; Thu, 07 Nov 2024 09:29:06 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4176E497 for ; Thu, 7 Nov 2024 09:29:36 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E847E3F6A8 for ; Thu, 7 Nov 2024 09:29:05 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH][meta-python 3/7] python3-pandas: inherit cython class Date: Thu, 7 Nov 2024 17:28:58 +0000 Message-Id: <20241107172902.4018835-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107172902.4018835-1-ross.burton@arm.com> References: <20241107172902.4018835-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Nov 2024 17:29:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113752 Use the new cython class to avoid duplicated fixup code to remove build paths. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-pandas_2.2.2.bb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb b/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb index 25b03c8e32..1e7bb1f3f6 100644 --- a/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb +++ b/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb @@ -13,24 +13,13 @@ SRC_URI += " \ SRC_URI[sha256sum] = "9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54" -inherit pypi python_mesonpy +inherit pypi python_mesonpy cython DEPENDS += " \ - python3-cython-native \ python3-numpy-native \ python3-versioneer-native \ " -PACKAGESPLITFUNCS =+ "fix_cythonized_sources" - -fix_cythonized_sources() { - for f in `grep -l -r -e '\/* Generated by Cython.*/$' ${PKGD}${TARGET_DBGSRC_DIR}`; do - if [ -e $f ]; then - sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' $f - fi - done -} - CFLAGS:append:toolchain-clang = " -Wno-error=deprecated-declarations" RDEPENDS:${PN} += " \ From patchwork Thu Nov 7 17:28:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52185 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F453D5D682 for ; Thu, 7 Nov 2024 17:29:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.77938.1731000547409313421 for ; Thu, 07 Nov 2024 09:29:07 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 00FD3497 for ; Thu, 7 Nov 2024 09:29:37 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B116D3F6A8 for ; Thu, 7 Nov 2024 09:29:06 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH][meta-python 4/7] python3-h5py: inherit cython class Date: Thu, 7 Nov 2024 17:28:59 +0000 Message-Id: <20241107172902.4018835-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107172902.4018835-1-ross.burton@arm.com> References: <20241107172902.4018835-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Nov 2024 17:29:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113753 Use the new cython class to avoid duplicated fixup code to remove build paths. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-h5py_3.12.1.bb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-h5py_3.12.1.bb b/meta-python/recipes-devtools/python/python3-h5py_3.12.1.bb index a84dd28822..152d952263 100644 --- a/meta-python/recipes-devtools/python/python3-h5py_3.12.1.bb +++ b/meta-python/recipes-devtools/python/python3-h5py_3.12.1.bb @@ -8,12 +8,11 @@ SRC_URI[sha256sum] = "326d70b53d31baa61f00b8aa5f95c2fcb9621a3ee8365d770c551a13db SRC_URI += "file://0001-setup_build.py-avoid-absolute-path.patch" -inherit pkgconfig pypi setuptools3 +inherit pkgconfig pypi setuptools3 cython BBCLASSEXTEND = "native" DEPENDS = "python3-pkgconfig-native \ - python3-cython-native \ python3-numpy-native \ python3-six-native \ hdf5-native \ @@ -21,16 +20,6 @@ DEPENDS = "python3-pkgconfig-native \ hdf5 \ " -PACKAGESPLITFUNCS =+ "fix_cythonized_sources" - -fix_cythonized_sources() { - for f in `grep -l -r -e '\/* Generated by Cython.*/$' ${PKGD}${TARGET_DBGSRC_DIR}`; do - if [ -e $f ]; then - sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' $f - fi - done -} - RDEPENDS:${PN} = "python3-numpy \ python3-six \ python3-json \ From patchwork Thu Nov 7 17:29:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52184 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85EF8D5D674 for ; Thu, 7 Nov 2024 17:29:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.77940.1731000548152515724 for ; Thu, 07 Nov 2024 09:29:08 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B4C31497 for ; Thu, 7 Nov 2024 09:29:37 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7090C3F6A8 for ; Thu, 7 Nov 2024 09:29:07 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH][meta-python 5/7] python3-kivy: inherit cython class Date: Thu, 7 Nov 2024 17:29:00 +0000 Message-Id: <20241107172902.4018835-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107172902.4018835-1-ross.burton@arm.com> References: <20241107172902.4018835-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Nov 2024 17:29:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113754 Use the new cython class to avoid duplicated fixup code to remove build paths. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-kivy_2.3.0.bb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb b/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb index 045ac23106..861ca32ad6 100644 --- a/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb +++ b/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://kivy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6d3bc49400e35d5a2279d14c40dcfb09" -inherit setuptools3 pkgconfig features_check +inherit setuptools3 pkgconfig features_check cython # Kivy's setup files only look for GLES libraries for Android, iOS, RPi, # and mali-based OS's. We need to patch the setup file to tell Kivy setup @@ -75,10 +75,3 @@ RDEPENDS:${PN} = " \ # python3-kivy/2.3.0/git/kivy/graphics/cgl_backend/cgl_gl.c:4568:52: error: assignment to 'void (*)(GLuint, GLsizei, const GLchar **, const GLint *)' {aka 'void (*)(unsigned int, int, const char **, const int *)'} from incompatible pointer type 'void (*)(GLuint, GLsizei, const GLchar * const*, const GLint *)' {aka 'void (*)(unsigned int, int, const char * const*, const int *)'} [-Wincompatible-pointer-types] # python3-kivy/2.3.0/git/kivy/core/window/_window_sdl2.c:8781:23: error: passing argument 1 of 'SDL_SetEventFilter' from incompatible pointer type [-Wincompatible-pointer-types] CFLAGS += "-Wno-error=incompatible-pointer-types" - -do_compile:append() { - for f in `find ${B} -name *.c` - do - sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" $f - done -} From patchwork Thu Nov 7 17:29:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82C19D5D67A for ; Thu, 7 Nov 2024 17:29:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.78176.1731000549144537282 for ; Thu, 07 Nov 2024 09:29:09 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7EB68497 for ; Thu, 7 Nov 2024 09:29:38 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3057B3F6A8 for ; Thu, 7 Nov 2024 09:29:08 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH][meta-python 6/7] python3-pycocotools: inherit cython class Date: Thu, 7 Nov 2024 17:29:01 +0000 Message-Id: <20241107172902.4018835-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107172902.4018835-1-ross.burton@arm.com> References: <20241107172902.4018835-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Nov 2024 17:29:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113755 Use the new cython class to avoid duplicated fixup code to remove build paths. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-pycocotools_2.0.8.bb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb b/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb index 4d4251316c..e298dbf574 100644 --- a/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb @@ -3,15 +3,11 @@ SUMMARY = "COCO is a large image dataset designed for object detection, segmenta LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://pycocotools/coco.py;beginline=45;endline=45;md5=12cb539683cf245df8b6ce782d78f647" -inherit pypi python_setuptools_build_meta +inherit pypi python_setuptools_build_meta cython SRC_URI += "file://0001-downgrade-numpy-version-to-1.26.4.patch" SRC_URI[sha256sum] = "8f2bcedb786ba26c367a3680f9c4eb5b2ad9dccb2b34eaeb205e0a021e1dfb8d" -DEPENDS = "python3-cython-native python3-numpy-native virtual/crypt" +DEPENDS = "python3-numpy-native virtual/crypt" RDEPENDS:${PN} = "python3-matplotlib python3-pillow python3-profile" - -do_compile:append() { - sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" ${B}/pycocotools/_mask.c -} From patchwork Thu Nov 7 17:29:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 52183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 923A4D5D680 for ; Thu, 7 Nov 2024 17:29:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.78177.1731000549732238934 for ; Thu, 07 Nov 2024 09:29:09 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3DA35497 for ; Thu, 7 Nov 2024 09:29:39 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.oss.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E44D93F6A8 for ; Thu, 7 Nov 2024 09:29:08 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH][meta-python 7/7] python3-pyproj: inherit cython class Date: Thu, 7 Nov 2024 17:29:02 +0000 Message-Id: <20241107172902.4018835-7-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107172902.4018835-1-ross.burton@arm.com> References: <20241107172902.4018835-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 07 Nov 2024 17:29:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/113756 Use the new cython class to avoid duplicated fixup code to remove build paths. Signed-off-by: Ross Burton --- .../recipes-devtools/python/python3-pyproj_3.7.0.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-pyproj_3.7.0.bb b/meta-python/recipes-devtools/python/python3-pyproj_3.7.0.bb index 0a8b710849..70bc3b76a3 100644 --- a/meta-python/recipes-devtools/python/python3-pyproj_3.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-pyproj_3.7.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3f3574263859ef2dc9bd7817d51adbaa" DEPENDS = "python3-cython proj" DEPENDS:append:class-target = " python3-cython-native proj-native" -inherit pypi python_setuptools_build_meta +inherit pypi python_setuptools_build_meta cython SRC_URI += "file://rpath.patch" @@ -21,11 +21,3 @@ RDEPENDS:${PN} = " \ export PROJ_INCDIR = "${STAGING_INCDIR}" export PROJ_LIBDIR = "${STAGING_LIBDIR}" export PROJ_DIR = "${STAGING_BINDIR_NATIVE}/.." - -do_compile:append() { - for f in `find ${B} -name *.c` - do - sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" $f - done - python_pep517_do_compile -}