From patchwork Sun Apr 6 16:49:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Hochstein X-Patchwork-Id: 60773 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 EF3E5C36002 for ; Sun, 6 Apr 2025 16:49:42 +0000 (UTC) Received: from EUR03-VI1-obe.outbound.protection.outlook.com (EUR03-VI1-obe.outbound.protection.outlook.com [40.107.103.40]) by mx.groups.io with SMTP id smtpd.web11.28094.1743958180083281429 for ; Sun, 06 Apr 2025 09:49:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@NXP1.onmicrosoft.com header.s=selector1-NXP1-onmicrosoft-com header.b=Kp1LChjm; spf=pass (domain: oss.nxp.com, ip: 40.107.103.40, mailfrom: tom.hochstein@oss.nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IE7G48oQqlAtZYeugPIHfUNHRM6V50OhTJmqUOoaP2W+D/hAiok8D/ucjieilPGjh2qKbulwh6rlhWfX3k3t96DIn1S5TRLQVfpEpJh+46IMP49MQE2kmLH1vKpt9/Kp3O8l9zwj5Q04aY9RwH/L1hL/ov7YJkLpUj9mPxscle2J3QXnLhMaNDIpFFq6CK5FLeGRxTD6GFv5G0fIEoBINC1TP4hciswvKJnFosf+JVzk2y2pcco9xJE72VaMM55C8xgDIveBq6YBqdFfKxNsZleh013j/yB+mRnOaTHzgJrPIwkFFRguNvoVdRRytxL8rDM/6qwuco8/e9YlQI0nfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7u9G6gy4ewDxffdqS/LgiHGS/TP17SZ70KjAyJDKqjQ=; b=lGZKLA/tAvvNS7QGDa/ieQeTalV8mbVkFvgMCADEikBb6pJ8fYDar92LlCPC0HKu7MrZrYUyw+LMhYeHNaH8ThX3JQrGRotQ2ZNOFui9BruRXu/IO1XjBu0c6EkO92IfQnMJkTaWMm+DomTnSoHYm4fKYmYW4G5JjVqI786eojvCYrOFTzrKZZq9uubbXOKJslBi6I8a1WxIyVypJloxtYXqWr/C8Q/N5Eo0c5ua94kqUiaI3x4QGtObxeLmmtH7dNeK4onnG0YCZZPiVUkkcjtmsbhlS2HxXE3pD7zIXz0BFQI7iC61EQXckAgh3qtHV2r3z0lo+Hd2M3ZPy6slvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7u9G6gy4ewDxffdqS/LgiHGS/TP17SZ70KjAyJDKqjQ=; b=Kp1LChjmdEhb2CUZRh3E9D0LUTwlH4hTHUm3qQGu4BW+fsxx8pVA3OHQ4ygqHbv3xXmRkzLBw3Ics0jWhNL83nfaewyoKuxUlR1V2HHzhrOfLMw+wI0HTgybeV/NGt3CogOdP6piGnJAxOaqSSYIhXtAj3kPPtkOGz3tZckDVfgETR5tZU+d6qrz4yw+VTjuZeeQ44GY+irfkv8n7CPKNdM3+SCDP6eu7VhXeDQjEvLeXuE6gc/jVwMO9GAZkxz89rHfXOYMF6eoRIdrXwo3T6mmLA9mp3ZqZ8NIQJgaJopHdTgQsT2sFFpAgNUqzjxid4B16n+jE7ejHk8/5xCDXw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PAXPR04MB9448.eurprd04.prod.outlook.com (2603:10a6:102:2b1::21) by PA4PR04MB8030.eurprd04.prod.outlook.com (2603:10a6:102:cc::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.33; Sun, 6 Apr 2025 16:49:36 +0000 Received: from PAXPR04MB9448.eurprd04.prod.outlook.com ([fe80::51ae:5f12:9744:1abc]) by PAXPR04MB9448.eurprd04.prod.outlook.com ([fe80::51ae:5f12:9744:1abc%4]) with mapi id 15.20.8606.029; Sun, 6 Apr 2025 16:49:36 +0000 From: Tom Hochstein To: openembedded-core@lists.openembedded.org CC: Tom Hochstein Subject: [PATCH v4 3/5] meson: Fix host_machine setting for native cross-file Date: Sun, 6 Apr 2025 11:49:07 -0500 Message-ID: <20250406164909.270945-3-tom.hochstein@oss.nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250406164909.270945-1-tom.hochstein@oss.nxp.com> References: <20250406164909.270945-1-tom.hochstein@oss.nxp.com> X-ClientProxiedBy: BYAPR02CA0021.namprd02.prod.outlook.com (2603:10b6:a02:ee::34) To PAXPR04MB9448.eurprd04.prod.outlook.com (2603:10a6:102:2b1::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9448:EE_|PA4PR04MB8030:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d03d6f4-320a-408d-0734-08dd752b03df X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 462abhPjXB6v0Sz3psNqsCEwbiwJkcDStuIRJO1rI2omR9jgFcMAtbbWGOywap5h/5RbwVZGfG9xr4ab6/NUcAHPuLETVdxZcQkiBbitNi/CL+9f+KndukcROlVXubb7vQyoMhfsbxmkxxijZJl/R4edD0qLZj779OqpdfQCJBCK+yee6z5HhZRFb9RaZjN2i/NctV3qj3hyTXZJS6rzCnMuqByXZvEGeyCeMRBCTYsD4ashvakYJagUT/8oa/7kDi3VwIcxo4HP75yplAlzj4hM76NOH/EjQNqnUJ89vmcf7GSNdlJ+vPiwTYTWUrwRPJ5eQLGdFqH6fEdb7NLjIg0tj/JW2jWdDh1Phpw+7xOkxCqqaES3MpGi1AuRCEwfpwBA3PqVfMbdzQ3gT5rTXrD0pd7Tf4T4rKOxaertNcL8S3GSmdhLjJK7IPStubF+nge/Pyr1JIElPyjmGYxv0HN5uRs3K5Pe2yRTh7GgOcv7b3xcnxPUfj7tUXF5n5Pnm5ka87NzmShjNUXTHffUYuH8gtpw+8kp+qUPt/koIP+B6IboPyirVqTvZcUldjyG3r3iTK465hD67GbWriWfClD/4w5Yv8xL9WgrfxQg0srK413w4YnGN8ch7US1uatH5tf7m2lhEjVvRGgirH/2EKSt/o/PmO50RIbjpKdY4uq6oHgs47mtp7OQMvUda6Ao7MU9zq5RBBigUnR8TxTJWvZ536APONdtYei/a84GSb30PZHPg0ErXqHSatlM4vcvi5rVD2jgP9o4wSlh7pbO0H04nuK+XXtdQo5ImlZTQy9NZUpx4S2CX1wydCGS2UVCvnwVXzMdZJx8Yr3gs8GqZWY34Md77EIKeGORb5Nzv/6Rz+uVsI9WYNtnJZf1HxPCv4EzT/DcqeSCpnF/Zc+JnVe1lCXe5oGJqcus0oX0T6bFLIm3YxjihYMZlreD3B7fFxxVnqVQwlCA/OQ645do3PzgsrP8PRvONQkbUbta2BEKHzsKl8Ea4ZMmrLc/ZyToD3iUU7NJVg6yW4Gdg7rhpnVUC5N3kZC7pLtyNUcCaIyYkg0VpmI1xMRjpP0oFPVu3GI5BuJPzKW6ma7aoYkKspxHRwU5B5xhsrhDTiJq+e//oI20iLSuCIVNSOoayge9VjBgj6kga81aVK8z5ShA53KKFGq/E67IbwFw9jAVyzPtWi1FHzwceMAeNnzufAFy1stzRi5JP0Ch2DUmcno7xTkyan2WdP2Z6k1k8bvNV899CyMY/3SsKJ3IC8V4uhndfGZnAUa1e1a1BdxX1u/k0X2DzL4shty0mb2SNygxjsTOBz82161guM1/Tm95FIgp9EaQiE9dlbhGZ1UA12Sxzt/w0roQaVV8PlxZW4KuqRJURd2j4v/2XJNEiouHFn/g X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9448.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hMqzrjsdJzBO+3mMkhSDfGrwORzj3soDc+pyyva5x+3fDV2JYza03TdnDG0HGmKjopbMs9vvYpblbx7EkIqAmXGR4ZqvdR32nJnlg3TkesI0gU+cdSDxtFvy+oL51aCnJcZBngiuIn4za9W3hQqByD4RKqtP/UPejBjCJ/qZymYMLM/UrMfjsEHbFawM0s6vNkjkxtPaGPvt4IZhIt+YMdxm4nK9yANGD/yvr1mgaXnK7+rHAxgKTnihlbplTkbVuqLKPksV5Mbeb9J1edxsKRpl/uErubT19CPYkzD4E4SBB1N7hiT3q06ZG5iV+Vea8SVsGRCtYbG4TWdYsrQsXftaroob9RekBvWs2/Xjb1FxUwWvVEYom1LNEgTk694WBUNqI4sd1rdkmrBjNRk4/DROaxEgYbdDNHOPJ6eTo4dXrnBAaAFbCUfapNT4qoSlWDLTvp2jXXSDqXc3T7IxdeG0Zq94FCYeLsxEpDeRazQJH0/PChT/q79fuoZdzADH1l4WmzsBwkXZOsd4MZTEK5V1wAilolm7aKtf7rZnR8raiHHyNHYWm7dVlHDc0M1rS8847Uvv81wGVq7efKa8S2d7cJJp57+eM0qm0gmrtYiUqyjhO0LirFzH0FU46QEXDzKk8CGqGXD3LTOx5Za7Y54zM036DmeG4K+YiCrzJgCRyMmnDIltlt2zYs9dNhbRqPv4r9oSWpwhZHDQXLAt0FNY7LBtkQEN9pZk61g7kdtbfI5csqkuopAWxd8g+QuKxQzbXCDoe4GCMbCnUpX6PR/+Sl775B/6C/IaVFa+p4rPQGLNvBX4OGlTaGSS1cpBojeclPr7Q6ipic7j+3jVWY6zEM5KCjVJXMhI80UXRapk5Ay+949Ygcl65Hd7nfGVGeeKRBU0r7FayrlAo4BJsi4hPPbkOkPqagCIS9Xbk7q/v/6a+3QGmhiGO+TJ0z7s4jWsYVs9vbuYtjVHcsg7ke0bqpZgp3Wz8nQ87409zOhZUi1mfhnA+wN12Z8xhe+j7f4LAJF0y8BkNYy9elojf973js3Vt6rrU6T4JRD9CyzBcoDC5qNBIzNrIvNxlvJzsmL3rL9zboooKoO3IBcm4acSUnLViq6QdKXnoB4rKcuE0zf+ccrq29dOprsCdTbtGdTXkdM5XqRRBxIUF9rSFWItZo4xpY9iqiK6r2KsaOrzc1kJbbcKgJ9FcvOW+0IG77V4O6wd/b5xh964IM784Ez5bjX8d+ar9KXnyfTvzEiYjD1dDdjrWyxWec+FtdYRFDMQeMiKhgKIxnUFJohl2aVzxHfots07M6CwgZ0m7msQP5X/pGnGOWTtJ2bbrpOdlBxKtkM8DZO5KT1ApfKDZUoqqDDfaNn+n57ET3SsgOjmT7dragXvpnGlxmpx5t52fI+TWTr0V80Aee8MZAsc/UH7VcbRilkgL24fXYtNn6NcspNSEZLC8OZvMVHljGM9JfYZU5h65TiDuhiWWx7GhU/dgiXIjQi4grMjnX9KxGKeqYJ3PAPGRc3rWpe5SrrVJ9bKPjq7srRUkehNhyJwMCBmOU+Zczs6TRNZJGLVqcVcuu0M7Ym5mlGECSkC5+hL X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d03d6f4-320a-408d-0734-08dd752b03df X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9448.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2025 16:49:36.6753 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2GfYAo4kc/Y8BrcyeGBv6++sB89d2O+4JIrdwgm9xkgD6hfABgqmMqCRhWA49XaLZwrrP2J7vAAngFuDc5U5Hw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB8030 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 ; Sun, 06 Apr 2025 16:49:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214384 For native and nativesdk, the meson cross-file settings for `host_machine` are incorrectly set for the build machine, not the "machine on which the compiled binary will run". See https://mesonbuild.com/Cross-compilation.html. Fixes: [YOCTO #15485] Signed-off-by: Tom Hochstein --- meta/recipes-devtools/meson/meson_1.7.0.bb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/meson/meson_1.7.0.bb b/meta/recipes-devtools/meson/meson_1.7.0.bb index 44872a5f7b..3e89669807 100644 --- a/meta/recipes-devtools/meson/meson_1.7.0.bb +++ b/meta/recipes-devtools/meson/meson_1.7.0.bb @@ -118,18 +118,14 @@ needs_exe_wrapper = true sys_root = @OECORE_TARGET_SYSROOT [host_machine] -system = '$host_system' -cpu_family = '$host_cpu_family' -cpu = '$host_cpu' -endian = '$host_endian' +system = @OECORE_MESON_HOST_SYSTEM +cpu_family = @OECORE_MESON_HOST_CPU_FAMILY +cpu = @OECORE_MESON_HOST_CPU +endian = @OECORE_MESON_HOST_ENDIAN EOF } do_install:append:class-nativesdk() { - host_system=${SDK_OS} - host_cpu_family=${@meson_cpu_family("SDK_ARCH", d)} - host_cpu=${SDK_ARCH} - host_endian=${@meson_endian("SDK", d)} install_templates install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d @@ -143,10 +139,6 @@ do_install:append:class-nativesdk() { FILES:${PN}:append:class-nativesdk = "${datadir}/meson ${SDKPATHNATIVE}" do_install:append:class-native() { - host_system=${HOST_OS} - host_cpu_family=${@meson_cpu_family("HOST_ARCH", d)} - host_cpu=${HOST_ARCH} - host_endian=${@meson_endian("HOST", d)} install_templates install -d ${D}${datadir}/post-relocate-setup.d