From patchwork Fri Apr 11 17:28:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Hochstein X-Patchwork-Id: 61186 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 84A00C369B1 for ; Fri, 11 Apr 2025 17:28:52 +0000 (UTC) Received: from DUZPR83CU001.outbound.protection.outlook.com (DUZPR83CU001.outbound.protection.outlook.com [52.101.67.1]) by mx.groups.io with SMTP id smtpd.web10.32589.1744392526803705511 for ; Fri, 11 Apr 2025 10:28:49 -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=M6GfSQWJ; spf=pass (domain: oss.nxp.com, ip: 52.101.67.1, mailfrom: tom.hochstein@oss.nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ysdnw1UerctLi39e+ZrLR01aPE3EaZBk31vuvExOVhqnREAtoY9yGIS/R4ble++gzxR6L3/FLMTf748srPD3ad3S80pTLo9tGCXofLKgqOvn6yNd6aaCw/yIWGb2Bo9H/bzAAlarfQLaHeMZ5swaRuVac0Mi8Ni5L2qGPIYROq98n6irLoOzzoiJ8k9EsFpFP3acQuaqSgEr9Sj17KfoLV8ffC1QRdeEWPpflrPnoVLGh006Y89qe5gd6hqeHXMXzGzZ9V/7BtsKVTYrwHF1PRtfrLT0rUsZ5JRoW5SlLHR7encXUdQ2csqOMl23qET6ALfy529vJVGKOYpUcQNWTg== 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=RlTv9Z+5+6uafom5gmXMNW1wWOJ2wQESc43LC5+PBgI=; b=R2nE7Iu5R24k40hP4b8z6jDK80aFDpiCPQDHfaSGJz8QmY6VTIGHJqSGTAP/Kt8if92ALhJZce58TA3mUaKpOXatv8FlcSdEEhiOz1VbJaycDmXmqheA6t4pHrdR206rDZBdzoH/paEMo28FcgMHQ2OJmHZPqQDSMxDqtJ3gyH6MDaGUoGbxwvVc43wEKNem8pjGut78P6iOq/ZHtAeJCz1LtILnhtPlNZt0zB51haOgAHaepOKLkACboX34xtllE7ac0mdlwVsJxWxu5Q+kLohqi/hEEuy4yOOcKsT/SZX5O4nG+315LFRZWpeySYbOgwp66Z+N1oyJu63/XSnhbQ== 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=RlTv9Z+5+6uafom5gmXMNW1wWOJ2wQESc43LC5+PBgI=; b=M6GfSQWJgRq7dk2q/O/9A/ydgrk/30EqGptOb2gmdGNINMBUOPEJq1NOhw8y7l7r/uavtvs+TVL5+ohZMMNq57L9GNE4ajjiHbvVyX9xyr4Wij7ki2QjB2fj2skfeuzyj1kDEyNf9KgIsxcdDVnfheEtDHMjQxAoEXahzgNDqjVckM4RSzLPF5GEvW7sdr3RQ1tQwMIpPDan6RwioQlxUhuaWxynLJ6JaKiZ+bjMAvk5BbpLud6jbttQx7AThE7NpTGi6zbhmI/Mc/7WuKr1rLMSke2W1/sLaYclmlGSOO419cOheTIkI8q5wMFMaQIjI/SDnkyHrVSsYT2eA0G1jQ== 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 AM9PR04MB8100.eurprd04.prod.outlook.com (2603:10a6:20b:3e3::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.29; Fri, 11 Apr 2025 17:28:46 +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.033; Fri, 11 Apr 2025 17:28:46 +0000 From: Tom Hochstein To: openembedded-core@lists.openembedded.org CC: Tom Hochstein Subject: [PATCH v6 4/6] meson: Fix host_machine setting for native cross-file Date: Fri, 11 Apr 2025 12:28:01 -0500 Message-ID: <20250411172803.3706607-4-tom.hochstein@oss.nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250411172803.3706607-1-tom.hochstein@oss.nxp.com> References: <20250411172803.3706607-1-tom.hochstein@oss.nxp.com> X-ClientProxiedBy: PH3PEPF000040AF.namprd05.prod.outlook.com (2603:10b6:518:1::5a) 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_|AM9PR04MB8100:EE_ X-MS-Office365-Filtering-Correlation-Id: b6ff214a-562a-4fa2-d32d-08dd791e505a 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|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: J1c4to1YUOC3EmmMSDHriTMCyqwR4gRoJ3PDh+4zoXHyBd0nOMGTeJH4Z4vfqPV7jr/V7ZnKOnZB/sNKdhb/hg9mxMmQa79hXuqSiUfbofWy9lrXGCly9+xuPmADqoM7ueYpQymCwj+m5oveFlR25iCDZkZ2BjwOaZcLAMwFlV4WdCi+Mt5hx+IJ/Clj9wUXtevf1BNE3m3wmo5nJvEjtCnM2gLzaSIl1PFMNUjgrOjuiGqvIu1uxx8b/uARor2T2PXzDAMheSmagOPusc50vnVgUA31KFu0kfUVMkp4hEPQGGFh7PHQjRBnWyPMYFnx0S85yS5c+idFc6d+YqZK7Aa89lK7EWuTbsAJpWX/hWBU5qR9/16j5/4uNRXYx9x1DQmLnVF0G5jlNLr/F/N6FM/v/qRa3hFwpv/hh6sf/FPfMzU1stbZp3vr3z4qn5Cc61WUu/w4+xHlvGJceoAYvoIhdsvC5FBLc2qUd+QIiI/+BSKIc29KvPMmncjc4Yn2T3uzRJz/QENbP+BznZg1Cx2VSGB3Zy3K/dTUbj0uHMyV9bhWSBshQVClQsRy/1u4hzfNy7ctQF6UvHYdJ4GWY4nv9IhoIlTKuVHAuacEysxzpaYun1t26hCIYWIC3BBg5iYyBb8283LRSaATZnjIMABYm2PuiuTPM4M61fTKhPrfb5nts9oKhVa5WR0SdcqQIsJ0Hr7SogfHMYGndJgsSFaCoTUFsg8TcdHW1YZhCRXpXjajJPXXk8go7j8p5539ehiiGQgK0L96Gq0VyNypVQeTG8bqiw4izBZJ7hqJ+YyhHknolTrGd+aDM3Nb8aOn1IiRsAWOeYeKhC7ZOzlgWyVBTgzGTggtmMN5IAK7nKd8xCTvvjPg5wnoGW8uINXv5FBsKdQgj98jLfIhjXOepdjzPIUHD5uS3BiAAXxsBlBMwtRQnpHu8hEVhzwHMI5IoE2TkZvADZwv8Gw7zZn9sp+zkQMdG3l7Ip0EyoE7jVrZpJkI7w1RAC6m7VmU2q3aH2pftCnGVFcLNOjYDQNXWH8NQ9ZR5egyXyhCy6TyNv4nHyzgm3h7Rlmg6jcDeKuUrBRHmbH1kCwDROGyEpSZ45zRmFoLKRl07AgW9llTHsGALrzkQHwKmSGd0Kr+i22fXN5HnbImPBpTkwibAFV4qNN5K0uxd35h+lQgAKi8sBZHQ/vtogh+ZbmZn0lhD8gmUrb9FoeoC4IO80UOznPpVT1pOLq02wlk8ZSCGF9fwWKoIvGVg3D/lBUMN/nb9i5xhIQcfoEpBW3Ozw6t7F2Lg02Jj1LMbG9LLILpZNRjcmQ1emhPOUyWOr/gAwLLLhyOPF6CYxp0nTHA7nqHUxrq/CaUBilPaGiAcj2XM/7YpFRCEGsoQiwd5nG1+0RsTN0NC5L2A3efKHFkSmkmjc+Cr1V2UGQ5GxresdyqErV+tbc= 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)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Le+dXT1ArWVBSU2pc2d/3dOMkywcoGKtWmaQWQgkUObv4f/G2KNyhidDj/VE+Ofh6CuAiw+KywImL/WYn4XW97fYqLL9pPdmr13TCi6Y8s0kc0Ogd5o/hUhLZQIWhGuaIhPUNp7wG3pFyLaJRmeUYFewA5c+pCX5Iv84ttWKSgTn5SQZymTTVifO+KDDUeIpsQW+ewhpX7dmRhGHKsziFsnfom1crIhxjw6ZaAntyRYwWSV0n9DY5jth/zLP9mHvkz7mnYMWSCGswIwDTsmwgoJardt5IXr/PRfhy6zmVuZIU1B2d1+i5FEM3ULPBI2IG96HVzRPstsj68RnbHyDG5B1BajxiL3Q7g61t6kT8V/HKMc+fs6FFo81sM/SiN3w10wu7YqoB69bnsaL4bs2QlwkpR1fQD+H06W6yGFrD8fQHVlO9AOoNiALjVwmfDzinzgxZkNmTpVwOu24sve4oLLZjbHIJuldRF3GT13DLVh/E/cjGOkLbAxSZXmTDEZkz4pI+JX8ps0YAm5HhhTLOZGFDUovJ0Oe/9Na+Me0gsU3t1ZxgwyVk9zrv7eaWlSbnnuLHmZLRKc0dVpfF4U0UtKznrf3/gmgsQB3++GEzltt467Lf/OjrdIrvyTfcGEL9QjCli81ha7KcPON4GKPKmjb9s7f1prqGwe1TEhjOBmGqIzzI1paOK7brOWcrmNNcTGY/kfAUPdleD8vz3F3dscBHgBlkATXTuKdqhLQXF35wEwq/ZZERhTV61tepr1A4LJjpS0cRfpTlJaWIm3lZ3apEJi3ZKX6/ncRjEu5CesZspdBbxTiV3U+Djnsy7VfRpz88oK4MsLgrbD8PtVDuddbwGsbXOS0W0Q5hl+VdFu31R/LG4gI84MCMVJS0nkCRnykAfp3Cs41pMA1NRdDxpUo0b2tYdVtOlRB0YZPxWVwdxtAiQmkgTAXUjP/Rb1I9wriTCiEkk3InaECSwLDFXUWevpopxuRAoy5IVCrUdETCc1MP2ltC9AoeKsP+DdUyx10KWjBGrN2nzWN2LNMbb4NqizWkBGfNVJYZgd3DOn3tyV6dc+OZOk59KXTlMv63w1dWk5RcHWt9EBzgnpsyDa106NU2b5cwUIPn4OfPlW50A4yvceDO2yssz+UA3NuPnihv3c5SUEYpfg6ufN+cwvG98paXZ4twUJN3V87yDaMLeCaqAjt9ZgEkpEVWUl6jSd8T2CtxcD3OoWWscZAnUL0O6YsNp3X0gGHZ1OGP7mVTKTQQlALfxA6dF4K8/WTBIxX7VlaOsiNhaF/8k7IL1fVfhYsDuuRCKxb/hwJLjFEMwRZpkoqB3IdBwcHUd3OE4ZU7EKzpZxnohuHj1U3odwbYbChhxHOY6pGVvBEFjnmObhT437OXqasUyjRMndO/cS/CwxLnvgo6LstiuO2vZNI3BuaMrTjUXuC8FneBsqFaSuBUFNw0VsQa2KXUQpyrD6Jn4C8vP0v7iNlgFsHwS6brd+Z1BBLz2+iPiSl1ULcsa9dMvs1Pmq1xaPJQzp2lXNmCJ7jkzAiWOxKrmwQ7uqEidm6IoJGCaW/sXDfPfZVWPwBZmiepsCZ/i0sLyXZXppYwyxXDn0ZIdyKM8i7mA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6ff214a-562a-4fa2-d32d-08dd791e505a X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9448.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 17:28:46.2285 (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: oPK//xyVjCHLovm0JyBWmC4UDRDLvFWhiogH+kafplMiDealJxNzBiOJ2KR5XaCluJQkfdf41rja/P3POa7HNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8100 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, 11 Apr 2025 17:28:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/214750 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.2.bb | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/meson/meson_1.7.2.bb b/meta/recipes-devtools/meson/meson_1.7.2.bb index 45a74612ce..7e9c661818 100644 --- a/meta/recipes-devtools/meson/meson_1.7.2.bb +++ b/meta/recipes-devtools/meson/meson_1.7.2.bb @@ -107,18 +107,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 @@ -132,10 +128,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