From patchwork Fri Nov 8 11:55: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: 52197 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 76A0ED5AE5E for ; Fri, 8 Nov 2024 11:56:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11171.1731066977286435026 for ; Fri, 08 Nov 2024 03:56:17 -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 AD0F2339 for ; Fri, 8 Nov 2024 03:56:46 -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 814663F528 for ; Fri, 8 Nov 2024 03:56:16 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 1/4] python3-cython: add patch to prefix map source paths in generated files Date: Fri, 8 Nov 2024 11:55:56 +0000 Message-Id: <20241108115559.770860-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 ; Fri, 08 Nov 2024 11:56:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206864 Cython generates C source code that contains mentions to the original .py files, which results in build paths being embedded inside the binaries. Implement prefix remapping to change these build paths to point at the target debug directory, so that we don't leak build paths and have reproducible builds. This patch is currently not submitted upstream, but will be shortly and I expect it to evolve before being merged. Signed-off-by: Ross Burton --- .../python3-cython/0001-WIP-prefix-map.patch | 148 ++++++++++++++++++ .../python/python3-cython_3.0.11.bb | 1 + 2 files changed, 149 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-cython/0001-WIP-prefix-map.patch diff --git a/meta/recipes-devtools/python/python3-cython/0001-WIP-prefix-map.patch b/meta/recipes-devtools/python/python3-cython/0001-WIP-prefix-map.patch new file mode 100644 index 00000000000..adc9463ffa7 --- /dev/null +++ b/meta/recipes-devtools/python/python3-cython/0001-WIP-prefix-map.patch @@ -0,0 +1,148 @@ +From 4d1b7911372561b22e03c7f2b4ec807502b5b9c1 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 4 Nov 2024 15:36:39 +0000 +Subject: [PATCH] WIP prefix map + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton +--- + Cython/Compiler/CmdLine.py | 9 ++++++++- + Cython/Compiler/Main.py | 9 +++++---- + Cython/Compiler/Options.py | 1 + + Cython/Compiler/Parsing.py | 1 + + Cython/Compiler/Scanning.py | 9 +++++++-- + 5 files changed, 22 insertions(+), 7 deletions(-) + +diff --git a/Cython/Compiler/CmdLine.py b/Cython/Compiler/CmdLine.py +index 776636c..f5a7c79 100644 +--- a/Cython/Compiler/CmdLine.py ++++ b/Cython/Compiler/CmdLine.py +@@ -74,6 +74,12 @@ class SetAnnotateCoverageAction(Action): + namespace.annotate = True + namespace.annotate_coverage_xml = values + ++class SetPrefixMapAction(Action): ++ def __call__(self, parser, namespace, values, option_string=None): ++ mappings = getattr(namespace, self.dest, {}) ++ k, v = values.split("=", 1) ++ mappings[k] = v ++ setattr(namespace, self.dest, mappings) + + def create_cython_argparser(): + description = "Cython (https://cython.org/) is a compiler for code written in the "\ +@@ -157,9 +163,10 @@ def create_cython_argparser(): + 'deduced from the import path if source file is in ' + 'a package, or equals the filename otherwise.') + parser.add_argument('-M', '--depfile', action='store_true', help='produce depfiles for the sources') ++ # TODO: add help ++ parser.add_argument("--prefix-map", action=SetPrefixMapAction) + parser.add_argument('sources', nargs='*', default=[]) + +- # TODO: add help + parser.add_argument("-z", "--pre-import", dest='pre_import', action='store', type=str, help=SUPPRESS) + parser.add_argument("--convert-range", dest='convert_range', action='store_true', help=SUPPRESS) + parser.add_argument("--no-c-in-traceback", dest='c_line_in_traceback', action='store_false', help=SUPPRESS) +diff --git a/Cython/Compiler/Main.py b/Cython/Compiler/Main.py +index 80946c0..28cfe68 100644 +--- a/Cython/Compiler/Main.py ++++ b/Cython/Compiler/Main.py +@@ -70,7 +70,7 @@ class Context(object): + language_level = None # warn when not set but default to Py2 + + def __init__(self, include_directories, compiler_directives, cpp=False, +- language_level=None, options=None): ++ language_level=None, prefix_map=None, options=None): + # cython_scope is a hack, set to False by subclasses, in order to break + # an infinite loop. + # Better code organization would fix it. +@@ -83,6 +83,7 @@ class Context(object): + self.future_directives = set() + self.compiler_directives = compiler_directives + self.cpp = cpp ++ self.prefix_map = prefix_map or {} + self.options = options + + self.pxds = {} # full name -> node tree +@@ -98,7 +99,7 @@ class Context(object): + @classmethod + def from_options(cls, options): + return cls(options.include_path, options.compiler_directives, +- options.cplus, options.language_level, options=options) ++ options.cplus, options.language_level, prefix_map=options.prefix_map, options=options) + + def set_language_level(self, level): + from .Future import print_function, unicode_literals, absolute_import, division, generator_stop +@@ -259,7 +260,7 @@ class Context(object): + rel_path = module_name.replace('.', os.sep) + os.path.splitext(pxd_pathname)[1] + if not pxd_pathname.endswith(rel_path): + rel_path = pxd_pathname # safety measure to prevent printing incorrect paths +- source_desc = FileSourceDescriptor(pxd_pathname, rel_path) ++ source_desc = FileSourceDescriptor(pxd_pathname, rel_path, prefix_map=self.prefix_map) + err, result = self.process_pxd(source_desc, scope, qualified_name) + if err: + raise err +@@ -509,7 +510,7 @@ def run_pipeline(source, options, full_module_name=None, context=None): + rel_path = source # safety measure to prevent printing incorrect paths + else: + rel_path = abs_path +- source_desc = FileSourceDescriptor(abs_path, rel_path) ++ source_desc = FileSourceDescriptor(abs_path, rel_path, prefix_map=context.prefix_map) + source = CompilationSource(source_desc, full_module_name, cwd) + + # Set up result object +diff --git a/Cython/Compiler/Options.py b/Cython/Compiler/Options.py +index 61950a7..cc52732 100644 +--- a/Cython/Compiler/Options.py ++++ b/Cython/Compiler/Options.py +@@ -796,4 +796,5 @@ default_options = dict( + create_extension=None, + np_pythran=False, + legacy_implicit_noexcept=None, ++ prefix_map=dict(pair.split("=", 1) for pair in os.environ.get("CYTHON_PREFIX_MAP", "").split()), + ) +diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py +index 25c0de9..6c0eccf 100644 +--- a/Cython/Compiler/Parsing.py ++++ b/Cython/Compiler/Parsing.py +@@ -2106,6 +2106,7 @@ def p_include_statement(s, ctx): + s.included_files.append(include_file_name) + with Utils.open_source_file(include_file_path) as f: + source_desc = FileSourceDescriptor(include_file_path) ++ print(f"TODO Cannot use prefix map on {include_file_path}") + s2 = PyrexScanner(f, source_desc, s, source_encoding=f.encoding, parse_comments=s.parse_comments) + tree = p_statement_list(s2, ctx) + return tree +diff --git a/Cython/Compiler/Scanning.py b/Cython/Compiler/Scanning.py +index 372392b..0fa3b30 100644 +--- a/Cython/Compiler/Scanning.py ++++ b/Cython/Compiler/Scanning.py +@@ -195,7 +195,7 @@ class FileSourceDescriptor(SourceDescriptor): + optional name argument and will be passed back when asking for + the position()-tuple. + """ +- def __init__(self, filename, path_description=None): ++ def __init__(self, filename, path_description=None, prefix_map={}): + filename = Utils.decode_filename(filename) + self.path_description = path_description or filename + self.filename = filename +@@ -205,6 +205,7 @@ class FileSourceDescriptor(SourceDescriptor): + self.set_file_type_from_name(filename) + self._cmp_name = filename + self._lines = {} ++ self.prefix_map = prefix_map + + def get_lines(self, encoding=None, error_handling=None): + # we cache the lines only the second time this is called, in +@@ -243,7 +244,11 @@ class FileSourceDescriptor(SourceDescriptor): + return path + + def get_filenametable_entry(self): +- return self.file_path ++ entry = self.file_path ++ for k, v in self.prefix_map.items(): ++ # TODO: should just replace the prefix ++ entry = entry.replace(k, v) ++ return entry + + def __eq__(self, other): + return isinstance(other, FileSourceDescriptor) and self.filename == other.filename 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 980cb046365..efce67d0921 100644 --- a/meta/recipes-devtools/python/python3-cython_3.0.11.bb +++ b/meta/recipes-devtools/python/python3-cython_3.0.11.bb @@ -7,6 +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[sha256sum] = "7146dd2af8682b4ca61331851e6aebce9fe5158e75300343f80c07ca80b1faff" inherit pypi setuptools3 From patchwork Fri Nov 8 11:55: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: 52198 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 77C7FD43357 for ; Fri, 8 Nov 2024 11:56:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11172.1731066977936277397 for ; Fri, 08 Nov 2024 03:56:18 -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 451D9497 for ; Fri, 8 Nov 2024 03:56:47 -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 11B713F528 for ; Fri, 8 Nov 2024 03:56:16 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 2/4] classes-recipe: add cython class Date: Fri, 8 Nov 2024 11:55:57 +0000 Message-Id: <20241108115559.770860-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108115559.770860-1-ross.burton@arm.com> References: <20241108115559.770860-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 ; Fri, 08 Nov 2024 11:56:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206865 Recipes that use Cython typically also do some bespoke fixup. Add a class to centralise the logic: - Set CYTHON_PREFIX_MAP to stop build paths appearing in generated objects - Strip "Cython Metadata" blocks from generated code that ends up in the -src package Signed-off-by: Ross Burton --- meta/classes-recipe/cython.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 meta/classes-recipe/cython.bbclass diff --git a/meta/classes-recipe/cython.bbclass b/meta/classes-recipe/cython.bbclass new file mode 100644 index 00000000000..f37ebeb23fe --- /dev/null +++ b/meta/classes-recipe/cython.bbclass @@ -0,0 +1,11 @@ +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 + # may contain build paths. + find ${S} -name "*.c" -print0 | xargs -0 sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" +} From patchwork Fri Nov 8 11:55: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: 52199 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 A6857D5D69A for ; Fri, 8 Nov 2024 11:56:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11173.1731066978664019327 for ; Fri, 08 Nov 2024 03:56:18 -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 D66BE339 for ; Fri, 8 Nov 2024 03:56:47 -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 9F6BE3F528 for ; Fri, 8 Nov 2024 03:56:17 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 3/4] python3-*: inherit cython Date: Fri, 8 Nov 2024 11:55:58 +0000 Message-Id: <20241108115559.770860-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108115559.770860-1-ross.burton@arm.com> References: <20241108115559.770860-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 ; Fri, 08 Nov 2024 11:56:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206866 Change recipes that depend on python3-cython-native to inherit cython instead. Signed-off-by: Ross Burton --- .../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\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" From patchwork Fri Nov 8 11:55: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: 52196 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 75BBBD5AE5C for ; Fri, 8 Nov 2024 11:56:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.11175.1731066978818596749 for ; Fri, 08 Nov 2024 03:56:18 -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 66360497 for ; Fri, 8 Nov 2024 03:56:48 -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 2F74C3F7D8 for ; Fri, 8 Nov 2024 03:56:18 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH v3 4/4] python_mesonpy: remove cython-specific INSANE_SKIPs Date: Fri, 8 Nov 2024 11:55:59 +0000 Message-Id: <20241108115559.770860-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241108115559.770860-1-ross.burton@arm.com> References: <20241108115559.770860-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 ; Fri, 08 Nov 2024 11:56:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206867 These INSANE_SKIPs are specific to cython and unrelated to mesonpy, so remove them. The new cython.bbclass should resolve the cause. Signed-off-by: Ross Burton --- meta/classes-recipe/python_mesonpy.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meta/classes-recipe/python_mesonpy.bbclass b/meta/classes-recipe/python_mesonpy.bbclass index 131fa74bede..81c087c7c75 100644 --- a/meta/classes-recipe/python_mesonpy.bbclass +++ b/meta/classes-recipe/python_mesonpy.bbclass @@ -33,10 +33,6 @@ def mesonpy_get_args(d): PEP517_BUILD_OPTS = "-Cbuilddir='${B}' ${@mesonpy_get_args(d)}" -# Python pyx -> c -> so build leaves absolute build paths in the code -INSANE_SKIP:${PN} += "buildpaths" -INSANE_SKIP:${PN}-src += "buildpaths" - python_mesonpy_do_configure () { python_pep517_do_configure }