From patchwork Fri Mar 17 07:25:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= X-Patchwork-Id: 21124 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 F25CAC74A5B for ; Fri, 17 Mar 2023 07:25:56 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web10.13881.1679037952881248766 for ; Fri, 17 Mar 2023 00:25:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=paGF/41i; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: zboszor@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id eg48so16710978edb.13 for ; Fri, 17 Mar 2023 00:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679037951; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=oml+LuoxAlJzwaC9neawoGtLMY9gjb0znF5aFuRvIuc=; b=paGF/41iX49m/Non8A1dWMHO3eW7pkCLE36UqWTccsJg8Pyunxiy2jU313XOdza+TM O7FwVF2u3WygBXDTzYdX8R7dxDuRQ7r5q2yvs+sorgdkB6q7SypF31oI/pCmHxH5c/YW Y4GXkwz+zdkhH5wIAnUlzmBMVlHWdJH2kAWWfO3eI4or/ZCmbiNrTYeAcf02ccXmJjOG xNPSQrUHBPDqe7zEbwhGdTmz+49uR7ufFAKnH8QRvx1LhvoRoId735WLJNbKQmP36OYu U/C1Ncepg5DR5pzozcE1c4T6tuz8HjK7vIvIIJu8EPbVUW0uu+aVZVLkZPWpd0yJuQTl sNOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679037951; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oml+LuoxAlJzwaC9neawoGtLMY9gjb0znF5aFuRvIuc=; b=pFEYJVIlY4OCjGqbipRAIlwGOjvCM2ZvPas0UuEa2jEkq+2xvC6SGUcHxOpkpct/M0 7907twFGfYSwnRND63Sl9ix0EbGoi9TGvRyaWzSCKg01rEoQKTSlbZvQvko0mR++m53y mRmyS1pank6QXnIN9zOc1dhHfRXz21BPz7T0KOeuMFXXq9xzcrhPTtsfZcf3ZKQLaevo nwp68Qf3Ix1gwYk9dE0C8zFHPighfwQE4Zlwq8QoB4uTnmn/VX02OraW1uYQWtrbHKcB x8g69Uq1VK4WWSncrAPdi6R3S5xo5BTsXnmEPYqak8p7RHiKzuF1F1Q6ENzdLYyZ+9ZB UcyA== X-Gm-Message-State: AO0yUKUfq/Xo3FZLLYQ5SLsc1ntP1mmFq/o1j3Ge0ni9W3JpxYxy0PR5 s1UDL1JCAIaKNo00kp+b+diOzZXkXQT+ng== X-Google-Smtp-Source: AK7set/Xr4q6ar1fGieiZhpEpvfW9CrSMswEkx/GOm+K3ujRm7laLS1ueLKhprQNcJKcxVWGt8ieQg== X-Received: by 2002:a17:906:46ce:b0:8e9:afb1:65c6 with SMTP id k14-20020a17090646ce00b008e9afb165c6mr2291409ejs.13.1679037950814; Fri, 17 Mar 2023 00:25:50 -0700 (PDT) Received: from localhost.lan (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id zc14-20020a170906988e00b00927f6c799e6sm621864ejb.132.2023.03.17.00.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 00:25:50 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [meta-python][PATCH v2 1/4] python_mesonpy.bbclass: New class Date: Fri, 17 Mar 2023 08:25:44 +0100 Message-Id: <20230317072547.1031123-1-zboszor@gmail.com> X-Mailer: git-send-email 2.39.2 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, 17 Mar 2023 07:25:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101586 Some python modules (e.g. SciPy, scikit-image) use meson-python (a.k.a. mesonpy) in pyproject.toml: [build-system] build-backend = 'mesonpy' This class, together with python3-meson-python and its dependencies will allow building such modules. Signed-off-by: Zoltán Böszörményi --- meta-python/classes/python_mesonpy.bbclass | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 meta-python/classes/python_mesonpy.bbclass diff --git a/meta-python/classes/python_mesonpy.bbclass b/meta-python/classes/python_mesonpy.bbclass new file mode 100644 index 000000000..f4c4a217a --- /dev/null +++ b/meta-python/classes/python_mesonpy.bbclass @@ -0,0 +1,17 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +inherit setuptools3-base python3targetconfig python_pep517 meson-common + +DEPENDS += "python3-wheel-native python3-meson-python-native" + +PEP517_BUILD_OPTS = '--config-setting=setup-args="${MESONOPTS} ${MESON_SOURCEPATH} ${B} ${MESON_CROSS_FILE} ${EXTRA_OEMESON}"' + +export MESONPY_BUILD = "${B}" + +# Python pyx -> c -> so build leaves absolute build paths in the code +INSANE_SKIP:${PN} += "buildpaths" +INSANE_SKIP:${PN}-src += "buildpaths" From patchwork Fri Mar 17 07:25:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= X-Patchwork-Id: 21125 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 0CE06C76196 for ; Fri, 17 Mar 2023 07:25:57 +0000 (UTC) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by mx.groups.io with SMTP id smtpd.web11.13816.1679037953449152855 for ; Fri, 17 Mar 2023 00:25:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=NbUosrlX; spf=pass (domain: gmail.com, ip: 209.85.208.43, mailfrom: zboszor@gmail.com) Received: by mail-ed1-f43.google.com with SMTP id eh3so16763002edb.11 for ; Fri, 17 Mar 2023 00:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679037951; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rfdSTR/cJONzajWWmd7UxXy3250d4quGi+9PkGlrPvw=; b=NbUosrlXocrsqQJ598WPJhDKd1BbMRJBC6Ju83zq1f+IFSu6bFJKdjFkK6Pike9OHj NqXvfXBnSxzG63Bek8aKJiMlNcAr12zjwYHORzRQqRLMmaXaxiVZ4c2n0deNrhTzCti5 fysQb3IWrOjfvp+hH9PnfT9qujLdZlfCLteftitdw2H5HwEpXD70xx8fcvFy26z7VA7e VtQ/Pyldmj9gcuegF3s9tpNkeBcaUL3gUQc3+558gMxPH3aeT86EygVwZLsLDJWU2wtP u3HWy+eGwpQICu7xoi/RyPzq1Y8hs9arPfTbFcStZBpsuVitvfmJXkOoc6SXR8/lnMcz D5/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679037951; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rfdSTR/cJONzajWWmd7UxXy3250d4quGi+9PkGlrPvw=; b=qj0WIgI1GcpyNB3dESTGVaOKWrvzkjc3xp1tTH0c51tei12gWJNpoHzaAEd9Z3ziT2 UC4sVG4hjm3bgsiWRmApkZgD2uguse/pKkenNqds6FPvWdCl/UJBdr/lLaRNsXci2xkU A7Gq1XEJx7FTr9RYDqasg5+H4vJ2QqtZov3o0I+0WliC+1JFlb5mm0LDv4UHdLolyiSM uATrQAfSig6oYd5kevLpW0Jyl6Q39jLnCASKADEK6aEXT94laAJu+No42/ftT+xhraNo 4oxu/SPSuPpCdzFGkQULPrbkQE/Ms6Wk2Ly4CaIKPRJj3xT4VBkhLvwqPyElH/C/NlKw /aeg== X-Gm-Message-State: AO0yUKX1Kt8/lvj0kQUbddTLs4k9+Wld8QlNM+YRFy6q13Mvll/kSVjO ZGOD4uG7FextKQpHpNUYmYuN/966sUa7Ig== X-Google-Smtp-Source: AK7set9WefziNAHw8X1I147zMJ2Mt6oXGrs8iCWxYaKg4ENDc/Et+ZCC1D+p4rijarlmbIji+cx9Jw== X-Received: by 2002:a17:906:b6c4:b0:880:a42d:dfb4 with SMTP id ec4-20020a170906b6c400b00880a42ddfb4mr12066987ejb.16.1679037951555; Fri, 17 Mar 2023 00:25:51 -0700 (PDT) Received: from localhost.lan (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id zc14-20020a170906988e00b00927f6c799e6sm621864ejb.132.2023.03.17.00.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 00:25:51 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [meta-python][PATCH v2 2/4] python3-patchelf: New recipe Date: Fri, 17 Mar 2023 08:25:45 +0100 Message-Id: <20230317072547.1031123-2-zboszor@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317072547.1031123-1-zboszor@gmail.com> References: <20230317072547.1031123-1-zboszor@gmail.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, 17 Mar 2023 07:25:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101587 Dummy module to indicate the presence of patchelf. Used by python3-meson-python. The CMakeLists.txt file is a crippled copy from this patchelf python module's sources, removing almost everything, and adding a dummy install target, so do_install() doesn't fail. Signed-off-by: Zoltán Böszörményi --- .../python/python3-patchelf/CMakeLists.txt | 7 +++++ .../python/python3-patchelf/patchelf.patch | 11 +++++++ .../python/python3-patchelf_0.17.2.1.bb | 31 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-patchelf/CMakeLists.txt create mode 100644 meta-python/recipes-devtools/python/python3-patchelf/patchelf.patch create mode 100644 meta-python/recipes-devtools/python/python3-patchelf_0.17.2.1.bb diff --git a/meta-python/recipes-devtools/python/python3-patchelf/CMakeLists.txt b/meta-python/recipes-devtools/python/python3-patchelf/CMakeLists.txt new file mode 100644 index 000000000..335bb503f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-patchelf/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.6) + +project(PatchelfPythonDistributions) + +install(CODE " + message(STATUS \"Install patchelf project\") +") diff --git a/meta-python/recipes-devtools/python/python3-patchelf/patchelf.patch b/meta-python/recipes-devtools/python/python3-patchelf/patchelf.patch new file mode 100644 index 000000000..96dbf2180 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-patchelf/patchelf.patch @@ -0,0 +1,11 @@ +--- patchelf-0.17.2.1/setup.py.old 2023-03-13 10:12:55.951514413 +0100 ++++ patchelf-0.17.2.1/setup.py 2023-03-13 10:13:18.877751074 +0100 +@@ -95,8 +95,6 @@ + version=get_version(), + cmdclass=cmdclass, + +- scripts=["bin/patchelf"], +- + url="https://github.com/NixOS/patchelf", + project_urls={ + "Source Code": "https://github.com/mayeut/patchelf-pypi", diff --git a/meta-python/recipes-devtools/python/python3-patchelf_0.17.2.1.bb b/meta-python/recipes-devtools/python/python3-patchelf_0.17.2.1.bb new file mode 100644 index 000000000..630bd808a --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-patchelf_0.17.2.1.bb @@ -0,0 +1,31 @@ +# This is a dummy package needed by python3-meson-python +SUMMARY = "A small utility to modify the dynamic linker and RPATH of ELF executables." +LICENSE = "GPL-3.0-or-later & Apache-2.0" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +" + +DEPENDS = "python3-scikit-build-native" + +PYPI_PACKAGE = "patchelf" +PYPI_ARCHIVE_NAME_PREFIX = "pypi-" + +inherit pypi python_setuptools_build_meta +SRC_URI[sha256sum] = "a6eb0dd452ce4127d0d5e1eb26515e39186fa609364274bc1b0b77539cfa7031" + +SRC_URI += " \ + file://CMakeLists.txt \ + file://patchelf.patch \ +" + +addtask do_patchbuild after do_patch before do_configure + +do_patchbuild () { + rm -f ${S}/CMakeLists.txt + cp ${WORKDIR}/CMakeLists.txt ${S}/ +} + +RDEPENDS:${PN} = "patchelf" + +BBCLASSEXTEND = "native nativesdk" From patchwork Fri Mar 17 07:25:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= X-Patchwork-Id: 21123 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 F2677C7618A for ; Fri, 17 Mar 2023 07:25:56 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web11.13818.1679037954106072477 for ; Fri, 17 Mar 2023 00:25:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=EgygobkP; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: zboszor@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id x3so16763734edb.10 for ; Fri, 17 Mar 2023 00:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679037952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k0rEw5cZmVlSaxD3aJx6Uan9IiizrEjlkUl1qATlVjU=; b=EgygobkPq20kR2F24Of0SkS3izDxYi+chBttqJfACdYOaiPAsGEIXqReSbu3Gae665 +pHm4DXs/k7NP5uexWleHdDY+JmNK/bSJmidyOw5eBBarSnQYBicJ5l9E/B7IW9NXyOy AMHiwAxqrbKMvD+5ogEfK8LGnohBPHVZi4isjJkTB/GBtyUIOKJ9lIJjxTk3gkx4W9ym Vk374deaauMc1tb5J9lvcjQ25mBoX3Ft5vr8srzxhd/lIj4PDVpetime3qBaTS1AopIc vl2QwQntKroq1u/GxD/XOmnT3vCS+be/bn9SvVbuqNWyWvtZATvm0McGZNa5KP843rR2 MfRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679037952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k0rEw5cZmVlSaxD3aJx6Uan9IiizrEjlkUl1qATlVjU=; b=Ejsj0qnlERjyg+xnQ5f09pp3g+CLG7CiGjq0C7FlW/gVPZocSUxbgKGqFoieNUvqP+ 36cG4Afybpk05Snt9AxUf+LJZ6MfZyuvaBVBt+iTV/LyWYfwgq4qowjFbZJdCCX3l2ys QVnEhUah4EE+QjRsU5lflFssrZc0lxkfkZsNBXJkUj90hW5BLFmrksNa5AkjEaC6iQNL 3N2FH/ergcOadpIEI2T9eqC2Vuic5rYOOoZj4lXJ+h3X+SEy1SW6noqJqdUP25ICWRip C4xcu2U8kcmDtg0bjyywTxVgPp3UWdXs5Wgn27jfU14z+JguEj1a9Y3S1hIg3mYk0GaR 3DNw== X-Gm-Message-State: AO0yUKUUgGxBxfEzr6vIJhaz0GjLtcfrbqxyLqmM82CQZ6eEaGJLLJu1 EKCq+eL++ILA6W16UPzDRGZTNdxaqkprTQ== X-Google-Smtp-Source: AK7set85TaMnlfNf99xo9brck5p8zbmiTekAgOq2p69i7saVh0x31M+2WTlbKAYDOe19hcjTgRjRIw== X-Received: by 2002:a17:906:7fc2:b0:8b1:3002:bd6d with SMTP id r2-20020a1709067fc200b008b13002bd6dmr15612740ejs.31.1679037952346; Fri, 17 Mar 2023 00:25:52 -0700 (PDT) Received: from localhost.lan (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id zc14-20020a170906988e00b00927f6c799e6sm621864ejb.132.2023.03.17.00.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 00:25:51 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [meta-python][PATCH v2 3/4] python3-pyproject-metadata: New recipe Date: Fri, 17 Mar 2023 08:25:46 +0100 Message-Id: <20230317072547.1031123-3-zboszor@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317072547.1031123-1-zboszor@gmail.com> References: <20230317072547.1031123-1-zboszor@gmail.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, 17 Mar 2023 07:25:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101588 Dependency of python3-meson-python. Signed-off-by: Zoltán Böszörményi --- .../python/python3-pyproject-metadata_0.7.1.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb diff --git a/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb b/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb new file mode 100644 index 000000000..32938421d --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb @@ -0,0 +1,10 @@ +SUMMARY = "PEP 621 metadata parsing" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=310439af287b0fb4780b2ad6907c256c" + +PYPI_PACKAGE = "pyproject-metadata" + +inherit pypi python_setuptools_build_meta +SRC_URI[sha256sum] = "0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67" + +BBCLASSEXTEND = "native nativesdk" From patchwork Fri Mar 17 07:25:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QsO2c3rDtnJtw6lueWkgWm9sdMOhbg==?= X-Patchwork-Id: 21126 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 09731C6FD1D for ; Fri, 17 Mar 2023 07:25:57 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mx.groups.io with SMTP id smtpd.web10.13882.1679037954770921077 for ; Fri, 17 Mar 2023 00:25:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z4CD4tBn; spf=pass (domain: gmail.com, ip: 209.85.208.46, mailfrom: zboszor@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id o12so16791253edb.9 for ; Fri, 17 Mar 2023 00:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679037953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K6Pzt6SfbNdSiPD0i+OSBDQEefTdoyTC4FtImzSJtho=; b=Z4CD4tBnRvEObpQ6SvuDD4qelKknvpZ0v0tGpIUY79YHHPD4hWuPxjO4J8Y9VETqou r3XzAECeU3aZwt3hsvz/KEd7F4GZ6EiUt8G5xgWCSYxz77g5EujnshHyqP9tKzPrpiDV lFe7h5UEgThn32JMrXAdRFMUW7BQpeZWNnO+f5q2/xUY8LyNBCDkaLUCmWiDsx+DyMsB Fe9RuFtSgm5qOi1s9sACJG73PinMIGNTYNzHeZu1gPNLotKl7e6E/W+OCg3QI5njww+f jFfyQZaOz0vzsklD+2edbRdDrq7ci6sOpmytpa3itGSSjDqUe7Ho9vKdhGVGJijLGncQ ng3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679037953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K6Pzt6SfbNdSiPD0i+OSBDQEefTdoyTC4FtImzSJtho=; b=F/uzXMkUY1YsJkj0iysA8xVZWLl21D7+rTXmNtsgP7GJk7642j7vbXjVf/jmrbEqJj /9K9iG6WnY4L8bPCP1blJrtmw2hK5WgwmlY3+E1eOLZARGfD0oKutULG1QftuwGn0vzC UEhnmVU3fNYRgJ3KA2kxV4KEHQkxowt8BAmQscCawHK1rZxZ50YE7PibLgJtUyrJBJmu MWoERY+AbFWcsbdOsp8rswLiV56W9uUaHuqCaAWSK6RXnPZaLc2o/+C/pFdI9B/uQ93a dp0hDYlNHUAMZrNitVIDoczCrabVPVOr/lDXp5KAChsyZjmpYnBxN/nnPfZVpqHBzcMy 3Niw== X-Gm-Message-State: AO0yUKUkaYdLYsYxcD5K3MCAbWYeJ977l5t10KVmOKfGagOAKEY04XyU KHDW16DlbaSzeVleJxxHq1cLFA+DVOYlxQ== X-Google-Smtp-Source: AK7set88bln0JU34Wq97GlGmL2PjYHzkPjR340vk/UAgRPDdJgymujm40C6xUR+82/oS3NNsDmoNFw== X-Received: by 2002:a17:906:da85:b0:931:1ccb:7360 with SMTP id xh5-20020a170906da8500b009311ccb7360mr4459569ejb.39.1679037952992; Fri, 17 Mar 2023 00:25:52 -0700 (PDT) Received: from localhost.lan (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id zc14-20020a170906988e00b00927f6c799e6sm621864ejb.132.2023.03.17.00.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 00:25:52 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-devel@lists.openembedded.org Cc: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= Subject: [meta-python][PATCH v2 4/4] python3-meson-python: New recipe Date: Fri, 17 Mar 2023 08:25:47 +0100 Message-Id: <20230317072547.1031123-4-zboszor@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317072547.1031123-1-zboszor@gmail.com> References: <20230317072547.1031123-1-zboszor@gmail.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, 17 Mar 2023 07:25:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/101589 Used by inherit python_mesonpy. Signed-off-by: Zoltán Böszörményi --- .../remove-hardcoded-setup-args.patch | 123 ++++++++++++++++++ .../use-installed-mesonpy.patch | 9 ++ .../python3-meson-python_0.13.0.pre0.bb | 28 ++++ 3 files changed, 160 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-meson-python/remove-hardcoded-setup-args.patch create mode 100644 meta-python/recipes-devtools/python/python3-meson-python/use-installed-mesonpy.patch create mode 100644 meta-python/recipes-devtools/python/python3-meson-python_0.13.0.pre0.bb diff --git a/meta-python/recipes-devtools/python/python3-meson-python/remove-hardcoded-setup-args.patch b/meta-python/recipes-devtools/python/python3-meson-python/remove-hardcoded-setup-args.patch new file mode 100644 index 000000000..3edda85dc --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-meson-python/remove-hardcoded-setup-args.patch @@ -0,0 +1,123 @@ +--- meson_python-0.13.0.pre0/mesonpy/__init__.py.old 1970-01-01 01:00:00.000000000 +0100 ++++ meson_python-0.13.0.pre0/mesonpy/__init__.py 2023-03-13 21:26:52.263117416 +0100 +@@ -669,8 +669,6 @@ + self._build_dir = pathlib.Path(build_dir).absolute() if build_dir else (self._working_dir / 'build') + self._editable_verbose = editable_verbose + self._install_dir = self._working_dir / 'install' +- self._meson_native_file = self._source_dir / '.mesonpy-native-file.ini' +- self._meson_cross_file = self._source_dir / '.mesonpy-cross-file.ini' + self._meson_args: MesonArgs = collections.defaultdict(list) + self._env = os.environ.copy() + +@@ -679,32 +677,6 @@ + if ninja_path is not None: + self._env.setdefault('NINJA', str(ninja_path)) + +- # setuptools-like ARCHFLAGS environment variable support +- if sysconfig.get_platform().startswith('macosx-'): +- archflags = self._env.get('ARCHFLAGS') +- if archflags is not None: +- arch, *other = filter(None, (x.strip() for x in archflags.split('-arch'))) +- if other: +- raise ConfigError(f'Multi-architecture builds are not supported but $ARCHFLAGS={archflags!r}') +- macver, _, nativearch = platform.mac_ver() +- if arch != nativearch: +- x = self._env.setdefault('_PYTHON_HOST_PLATFORM', f'macosx-{macver}-{arch}') +- if not x.endswith(arch): +- raise ConfigError(f'$ARCHFLAGS={archflags!r} and $_PYTHON_HOST_PLATFORM={x!r} do not agree') +- family = 'aarch64' if arch == 'arm64' else arch +- cross_file_data = textwrap.dedent(f''' +- [binaries] +- c = ['cc', '-arch', {arch!r}] +- cpp = ['c++', '-arch', {arch!r}] +- [host_machine] +- system = 'Darwin' +- cpu = {arch!r} +- cpu_family = {family!r} +- endian = 'little' +- ''') +- self._meson_cross_file.write_text(cross_file_data) +- self._meson_args['setup'].extend(('--cross-file', os.fspath(self._meson_cross_file))) +- + # load config -- PEP 621 support is optional + self._config = tomllib.loads(self._source_dir.joinpath('pyproject.toml').read_text()) + self._pep621 = 'project' in self._config +@@ -749,19 +721,6 @@ + [binaries] + python = '{sys.executable}' + ''') +- native_file_mismatch = ( +- not self._meson_native_file.exists() +- or self._meson_native_file.read_text() != native_file_data +- ) +- if native_file_mismatch: +- try: +- self._meson_native_file.write_text(native_file_data) +- except OSError: +- # if there are permission errors or something else in the source +- # directory, put the native file in the working directory instead +- # (this won't survive multiple calls -- Meson will have to be reconfigured) +- self._meson_native_file = self._working_dir / '.mesonpy-native-file.ini' +- self._meson_native_file.write_text(native_file_data) + + # Don't reconfigure if build directory doesn't have meson-private/coredata.data + # (means something went wrong) +@@ -784,7 +743,7 @@ + def _proc(self, *args: str) -> None: + """Invoke a subprocess.""" + print('{cyan}{bold}+ {}{reset}'.format(' '.join(args), **_STYLES)) +- r = subprocess.run(list(args), env=self._env, cwd=self._build_dir) ++ r = subprocess.run(' '.join(list(args)).split(), env=self._env, cwd=self._build_dir) + if r.returncode != 0: + raise SystemExit(r.returncode) + +@@ -800,22 +759,6 @@ + """ + sys_paths = mesonpy._introspection.SYSCONFIG_PATHS + setup_args = [ +- f'--prefix={sys.base_prefix}', +- os.fspath(self._source_dir), +- os.fspath(self._build_dir), +- f'--native-file={os.fspath(self._meson_native_file)}', +- # TODO: Allow configuring these arguments +- '-Ddebug=false', +- '-Doptimization=2', +- +- # XXX: This should not be needed, but Meson is using the wrong paths +- # in some scenarios, like on macOS. +- # https://github.com/mesonbuild/meson-python/pull/87#discussion_r1047041306 +- '--python.purelibdir', +- sys_paths['purelib'], +- '--python.platlibdir', +- sys_paths['platlib'], +- + # user args + *self._meson_args['setup'], + ] +@@ -905,8 +848,7 @@ + editable_verbose: bool = False, + ) -> Iterator[Project]: + """Creates a project instance pointing to a temporary working directory.""" +- with tempfile.TemporaryDirectory(prefix='.mesonpy-', dir=os.fspath(source_dir)) as tmpdir: +- yield cls(source_dir, tmpdir, build_dir, meson_args, editable_verbose) ++ yield cls(source_dir, build_dir, build_dir, meson_args, editable_verbose) + + @functools.lru_cache() + def _info(self, name: str) -> Dict[str, Any]: +@@ -1105,15 +1047,7 @@ + for key, value in config_settings.items() + } + +- builddir_value = config_settings.get('builddir', {}) +- if len(builddir_value) > 0: +- if len(builddir_value) != 1: +- raise ConfigError('Only one value for configuration entry "builddir" can be specified') +- builddir = builddir_value[0] +- if not isinstance(builddir, str): +- raise ConfigError(f'Configuration entry "builddir" should be a string not {type(builddir)}') +- else: +- builddir = None ++ builddir = os.environ.get('MESONPY_BUILD') + + def _validate_string_collection(key: str) -> None: + assert isinstance(config_settings, Mapping) diff --git a/meta-python/recipes-devtools/python/python3-meson-python/use-installed-mesonpy.patch b/meta-python/recipes-devtools/python/python3-meson-python/use-installed-mesonpy.patch new file mode 100644 index 000000000..64c2c304c --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-meson-python/use-installed-mesonpy.patch @@ -0,0 +1,9 @@ +--- meson_python-0.13.0.pre0/pyproject.toml.old 2023-03-14 08:55:19.092987968 +0100 ++++ meson_python-0.13.0.pre0/pyproject.toml 2023-03-14 08:55:40.108672980 +0100 +@@ -1,6 +1,5 @@ + [build-system] + build-backend = 'mesonpy' +-backend-path = ['.'] + requires = [ + 'meson>=0.63.3', + 'pyproject-metadata>=0.7.1', diff --git a/meta-python/recipes-devtools/python/python3-meson-python_0.13.0.pre0.bb b/meta-python/recipes-devtools/python/python3-meson-python_0.13.0.pre0.bb new file mode 100644 index 000000000..a113408d7 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-meson-python_0.13.0.pre0.bb @@ -0,0 +1,28 @@ +SUMMARY = "Meson Python build backend (PEP 517)" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d580b27e67cc0892a5b005b0be114b60" + +DEPENDS = " \ + meson-native ninja-native python3-ninja-native \ + python3-pyproject-metadata-native \ + python3-patchelf-native \ +" + +PYPI_PACKAGE = "meson_python" + +inherit pypi python_mesonpy +SRC_URI[sha256sum] = "8d537a0304709c31c11ffa34872a62a4c06a6a6c24fc862b7fb4306f3e881b95" + +DEPENDS:remove:class-native = "python3-meson-python-native" + +SRC_URI:append:class-native = "file://remove-hardcoded-setup-args.patch" +SRC_URI:append:class-nativesdk = "file://use-installed-mesonpy.patch" +SRC_URI:append:class-target = "file://use-installed-mesonpy.patch" + +RDEPENDS:${PN} = " \ + meson ninja python3-ninja \ + python3-pyproject-metadata \ + python3-patchelf \ +" + +BBCLASSEXTEND = "native nativesdk"