From patchwork Fri Dec 27 06:53:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Varatharajan, Deepesh" X-Patchwork-Id: 54706 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 22708E77191 for ; Fri, 27 Dec 2024 06:54:09 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.9087.1735282439283866276 for ; Thu, 26 Dec 2024 22:53:59 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=2091c24697=deepesh.varatharajan@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4BR5saeJ025794 for ; Fri, 27 Dec 2024 06:53:58 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 43nmn8d9rk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Dec 2024 06:53:58 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cbU+N83gRbRvzjoLUBSBVrAZpLbR4gPb/8YCtv0u9XPN9zQZ8u+ASZ/WJgSbMZPBwmZGoHre40Lto8Xf2j3246ARD9bfE259Otvu4QLX9J6vkfGOTiDvrKnvijByhHwxXgr8W1B+C8WU81JkdRwiVMwMmknFfhMlm/Bjg+OoC0+19d2cr6BZPK1Cg/y7giC/q0ah4E3p6quI9OksVL8mPRsHjakQK12tpvg8ayrg6zFjQn/bPdiQwNx8drrL/SN14zNT8u0ZxcfQbmlMoUAltKIwfeqxCkcY1TymhzdK4x/3rYvd+wmb03eylEieZZQRlz/K++KgdXvYukXTRgjahA== 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=tV145LeqPXHjEn9w+Ny2bJZfqrs0i1cRSt0QXZcwf2w=; b=a+YRxh28PO/QK1T05aAtJlMxJ3aZ1QPSU89PFrSjs29+m9evOxhFK3PDvTtUN1BfTDhSPmQZXecJ8If+7a12j36ejd1M/r55UPJ3of9x9WZOpXFXYFiul4ibZJJL2NaLD+pInw3HE9VJvVPQksRqG2wjYgbB74GLTHhhUV0ta0pD4JsFcExPJ+LJi9e0RTc6zj+aw7wBI8uoDHAFb6kwn6hvpPbCnPrS/ta8e/f9XpVXt/r0gOViiTztrfwiFhCEs4qdv1ZP/WmkSr9EH1d1/cWHz/rNn0wLKFnzByZDF50ext2Dv4bT3od/tYcZWRCH63NwbmnjHfvHlaafaEqJTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB5648.namprd11.prod.outlook.com (2603:10b6:a03:302::11) by DS0PR11MB8133.namprd11.prod.outlook.com (2603:10b6:8:15b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8293.14; Fri, 27 Dec 2024 06:53:50 +0000 Received: from SJ0PR11MB5648.namprd11.prod.outlook.com ([fe80::c784:dce5:4b7b:54f]) by SJ0PR11MB5648.namprd11.prod.outlook.com ([fe80::c784:dce5:4b7b:54f%4]) with mapi id 15.20.8293.000; Fri, 27 Dec 2024 06:53:50 +0000 From: Deepesh.Varatharajan@windriver.com To: openembedded-core@lists.openembedded.org Cc: Shivaprasad.Moodalappa@windriver.com, Sundeep.Kokkonda@windriver.com, Deepesh.Varatharajan@windriver.com Subject: [PATCH 1/3] rust-target-config: Update the data layout for x86 and ppc targets. Date: Thu, 26 Dec 2024 22:53:35 -0800 Message-ID: <20241227065337.1257972-1-Deepesh.Varatharajan@windriver.com> X-Mailer: git-send-email 2.43.0 X-ClientProxiedBy: BYAPR03CA0011.namprd03.prod.outlook.com (2603:10b6:a02:a8::24) To SJ0PR11MB5648.namprd11.prod.outlook.com (2603:10b6:a03:302::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5648:EE_|DS0PR11MB8133:EE_ X-MS-Office365-Filtering-Correlation-Id: 76329f8a-b3e0-4574-cc60-08dd26433855 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024|52116014|38350700014; X-Microsoft-Antispam-Message-Info: JJQY0wZEew9XxMtrT9mzBKIMbIJN2fE9c8mfd4vyg9tHxDEj/JcxByFWAQmdbX4x7qs4vffJxvuIf9LzBnNItE1MxtWurSTCBJIVSwre8iQLnBn1vTfbmXs1GVNmpg/YGKOQ1EM8v1M67O1bu3BES2hIyTd2I2hdSs+8csYoaUvdGB+YjLPHQP3Kv5noySSdfrzmEN0sKzCG2x30L05Y6BhxjR8A2YFdWgAloOXiQ1AiqGTDpFc4fQ34n+VXkNTIxFApIZnRKHDRNICAabdfviI8qH96oN5fLSCGt9fvZ9qsynifDP3jrRGuyZT/EQUa4MujK+r7/HXPVSmC0CmSpgx2r2EcxuTZY0yski0Hgl6dTvEF7fRIVaaf3sJsKj4OQsdE/X4BBRb1uhkNCGBQ4H7WHbi19YCFlUs1uwanchPtq3UcbdG6O/M9YhU/RU0wQAL69dq5gozG1Qq15yp4iEcuE2FuGSTFpCvYgmqC5DXVScT+RGzegXifPuPKaTzKV+aqEszkEqoif9qLk/ucorP73/PwrTY/8wif47izyJNiBeYEB77YepJP4os77MPeqmt/tLRz4grjwktcH2HsZl2CWhycArua9b0iUSPFx7Zw3jk7RHl7ubvj1ZUcu577q4wPszKBXP+z30Qvf0si6QIFW8b5IOaMrYQ5yya52OCmO6egn0rIpi1BUolqXjo1jD//Gzw3d/yoSzFIKGPfddfS+9X4OtDthxEkC6RrU+j9vL8qc7mMrne/FsyRADeckOGvLLgV7wp8YtiMWdWdPYQlvIDB++3+HOXEf+KXwQ1Lhx4bgWOBFM1MJJhXSrGyLqvyk8tCNWIN0FjdcXCkJfl78YQN34xyNJoqybdSS8QiaT6IhgrjolFOxx8ecc6KzV/8488Qb8VRSGBxFuBHmVx7mCThsp0NvHuNetyUNFc6ExWpx+N8ZUm6sR4dparoI424flAqLeph0896jFyASPS99sPqlshaeaaIcfM4zXVBzCILoeHJUEBDz0fIW6BeoToeab4EZ+mT+xPcQ5/hrVsmtTn1UMcvrVZXBCwu8+pDTw4mf+4pmed0vKItqTTzwsexZljEI+qmJWnu9LEy23YLQ7Fh1HONVCSmcToUpy4fVq7JBAPTKE5nTvRzabdh6pWlAe6zqaYsyiuNWR991KNokXIivTBmgRI9OpKY/yO0Vm1xgIoYrFwpKsRIuOZuzV+/c409i5XXRn/i29ex1EawahHhc/OHUB1kBA3ThiKd5jz7/LY9wO7h2nwxRdCKEme07ZTXQLEfSvqrTZWVGHtvPGnq2ynWB8UxqIo4o2xf6TxG4RvtQr3CWW63q0Sdp90rNzEY3g3RnJUj4T0efV90BFloNPkpCz1SLGesD6/cvPU9TLXUklXUVGDNAFyodjvvXrdQ7ShMef5yNN0q8qCR33nM36VQNadkw9ZSR8i6rxi9DIhce1qDjHHoNtku X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5648.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5Y7xzcms/h2Dkkb5V007H2NBfOXbHwimSo+kv9Rq2KEB5pkzNoQp7sVAx51jXTwm1iH6DHs06FLPLBx8cm6YVRvw1iccv0/f4nqBsDHhIiHkUPT2iSaYi3HZFvgcqrzWQpvSLEo8onk9wcc7tJw57ss6B6vbXVyOPrHuDX50s9rKHBGftpWHNu8c9ch6tC0hFu7KjLwL1bZz4Am31IChYKmjeF725zUQDdmx86x+5lKfefciyPr3ma5SBTgnWcooi9HUIroqAQkzgK6rpOa2+FmYkMbKu0UeR7vqbX8+KJXw1R1Yjbg4N5G2j576p3sJz6sA23QYCKSeOmGk1n/0h2AxqAmNWePZscSzfhYXd0qh/WrnkHNErukEqxXtWgmkTmhnRMk5DaiYXe3q07ec61TNHiJqfypnVkPH6X2IQtnLZuv/U8vsqs1g3OJ256/aT56iFAEHxSUxogXjSYuX8xggv+7+19LW4QsjMw/ZIoG6gyduLQMKD+9eATGdKMd0EE1m6cJcNvgGY0O+HvRmSV/q+dVKtFzuZO1sLMe43PTNeKXXm69X44e0MYkIf1UvBn5yAHjMW+p1dg/94UUn88Ke+CNo+xkrEnWgF9CwXOjIfBsOeeqZrUpfzgZ4Edg8MPjs8wrFK36yiSiS35RzBVqPG1gVfHlXvDIMxpRkDyvsojLTXSlZN/zEBlWipU1jXxoPLNHDf+vHtmuMhFFdXzqidd9gFPJXt65oxWzkbrMORdB20feNQ+7PM1/uduNzEPpn3GIXdoV3h6MR4F9Fcgo0gM5E6dDr3RwzASvaydJQBaweN0f8EP1SyfdurvQ+VhTKizMNjoL3jVXRgmcOVhOfD+US3mR+Asad8Gjhf0xSFlDgcrC2ifKB9LNEBjDylJASUECjOjNaTYPOcd49DABv+6QaPuJwJFYgl+gAWGFPL+jYFO4WLuL2Q+S2lU2DQ1PJrHTtjkXgKDU23oUwW7J8pReqJ7xjcqtjdJO+48Bduh7ODcDKN+eemOkBfT/uJzcGSvNQbk/ZwJFvLxbBmFewM1Y2ntRh3Sip08nzs4W2Qo6Lwd6fCyNi14qXEPzLRrlKFErboYcfMCVJtbsOVitpcbbjht4XMXDC6TnoBhcHmelSIv1mIcrw4DjnZDRh+cWfEV31hcAulzENfTHY9manLP63nsLQLPxafDZ+F/ZbnzbnAN7iJ8bffYWgS6aXT8d8Xstk8WK2dJYXVTsAFNbcm3VT2Y2b4h7fN/P9FZ7urv9NoyVugc4Oi2iIZ9sCzbRAte7OBBPP3gbhH/fHPnkIG8BCqQ4NGXa8BFXcSL5XmdFtA2dPKTB5I9AU5AuQxtDePIUgfAATKAY2ftEjCP+1CkL8WNWE7vGDNapwKjQSRc615jYwexamhHx2cgDsGZ9a1E5a+t9SlrP5+V0aYCxGdbJOq1r10LmJzKeiwOhOugkGuClDxRsBxxDpazAV/a9/dEL6kxaMQHigF4y41IpJOQ+iGUuZfy4Ng07Mv31Iy15Zsb8mn1lnVQK+34/yajkms9L0ot6d+6C0yHt6LcV6xMmbxGLktTIWu+wEEIrNCK85ogy5g3Hdi0kGEe017LW+uAgJGMCtF+zWF2qVLqlJ4Di1MPETk2BMShY/b/U= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76329f8a-b3e0-4574-cc60-08dd26433855 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5648.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2024 06:53:50.6963 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QrabREsMTBYp/bg/PGe38OYj8Cc9WPv4IjiTFd0jUUpRxGM1abi9nzxlCPwjgHo61pgCjwIRAl+YKocm26hmuqMTKmopx81fiuacy4UbwC1MR303mV+QsQTPoGB7oAau X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8133 X-Proofpoint-GUID: 1nmweM6WRYyJnEzPEBrJCYVvXRfKMtwQ X-Proofpoint-ORIG-GUID: 1nmweM6WRYyJnEzPEBrJCYVvXRfKMtwQ X-Authority-Analysis: v=2.4 cv=CeHy5Krl c=1 sm=1 tr=0 ts=676e4f06 cx=c_pps a=Odf1NfffwWNqZHMsEJ1rEg==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=RZcAm9yDv7YA:10 a=bRTqI5nwn0kA:10 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=6mtmzNMZVtx1r3RMtMcA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-12-27_02,2024-12-24_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=657 spamscore=0 adultscore=0 suspectscore=0 mlxscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2412270058 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, 27 Dec 2024 06:54:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209094 From: Deepesh Varatharajan The data layout for x86 and ppc targets were different in rust from llvm. ----------------------------------------------------------------------------------------- error: data-layout for target `x86-linux`, `e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128`, differs from LLVM target's `i686-unknown-linux-gnu` default layout, `e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128` error: data-layout for target `powerpc-linux`, `E-m:e-p:32:32-i64:64-n32`, differs from LLVM target's `powerpc-unknown-linux-gnu` default layout, `E-m:e-p:32:32-Fn32-i64:64-n32` ----------------------------------------------------------------------------------------- Rust commits for updating the data layouts: x86: https://github.com/rust-lang/rust/commit/dbff90c2a7c751cf9d6843cd585429beb100c17d ppc: https://github.com/rust-lang/rust/commit/ad7ea8b7e690e6000006b6fde630a2c8c4385019 Signed-off-by: Deepesh Varatharajan --- meta/classes-recipe/rust-target-config.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 399c13db26..7518e5bc01 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass @@ -167,7 +167,7 @@ TARGET_C_INT_WIDTH[x86_64-x32] = "32" MAX_ATOMIC_WIDTH[x86_64-x32] = "64" ## i686-unknown-linux-{gnu, musl} -DATA_LAYOUT[i686] = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128" +DATA_LAYOUT[i686] = "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128" TARGET_ENDIAN[i686] = "little" TARGET_POINTER_WIDTH[i686] = "32" TARGET_C_INT_WIDTH[i686] = "32" @@ -216,7 +216,7 @@ TARGET_C_INT_WIDTH[mips64el] = "32" MAX_ATOMIC_WIDTH[mips64el] = "64" ## powerpc-unknown-linux-{gnu, musl} -DATA_LAYOUT[powerpc] = "E-m:e-p:32:32-i64:64-n32" +DATA_LAYOUT[powerpc] = "E-m:e-p:32:32-Fn32-i64:64-n32" TARGET_ENDIAN[powerpc] = "big" TARGET_POINTER_WIDTH[powerpc] = "32" TARGET_C_INT_WIDTH[powerpc] = "32" From patchwork Fri Dec 27 06:53:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Varatharajan, Deepesh" X-Patchwork-Id: 54704 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 2105AE7718F for ; Fri, 27 Dec 2024 06:54:09 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.9049.1735282439763856113 for ; Thu, 26 Dec 2024 22:53:59 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=2091c24697=deepesh.varatharajan@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4BR5saeK025794 for ; Fri, 27 Dec 2024 06:53:59 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 43nmn8d9rk-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Dec 2024 06:53:58 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=S27w3oQPXQIvwdTrF0gMvp8K0Ck8ajh/fAa+52amw+FfG6E9BG46vBAqBR0XL0uP8VDDzi/Vcm6xZbkEEcl+9v64RY0ksrQ5ocwTjDgd4qBGED3J7NtmRK68d9hdF66b1RTnFTeeionUryi/mkealcsVeOVZ5SfMw7U88G57wKv8pVkjgjVNzhPWE1tyROEyQpO0aQ/j47gsId4/9pkTUFpJL+GRpFQaWy4bx0OUnyqS9zx2MolcYul3qQty8IpsBt5mWeL2aIRmmY9iegLri8qLsLOyCZGD8b4BDF3YEnAmztcQBNgxP2GhLnYGek3ovQMqIMa896aDVKcEeag7Yg== 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=cv41km74rNoXxrqystEV/L1Z9KZTBPcvnV+wWlmXCdM=; b=UnenEBbk2jxQlQXNCT38DGhrMfNj1o3wJlQHu8WI/5gBO+G6uVBqlZihFn/PELfPakK/uipOchnA6AwMSUfS0jAvQwPl6e5B2FPS2lNC/PAPhROHc+f6Z5diZr7G/3lTYk3pxEVjcFUuPskeqA9oKMTzp6bTl46cwVQ9WKfP8xFhjhl8bsoikrIaHoGx4jD9UdpYnbfiIES3EyNu3EGN1y9fRKFfdC5YHIpHGZ/uyRWRi32916bn2kBoIfUD30EBkWOaw/M4Wex7LjOTypm8bA7S1UzQ5V3S0FiueJleQMY3BXgQt1RQGihBmeLpdig+lMM+TbgvrJNlAH762rB0vg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB5648.namprd11.prod.outlook.com (2603:10b6:a03:302::11) by DS0PR11MB8133.namprd11.prod.outlook.com (2603:10b6:8:15b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8293.14; Fri, 27 Dec 2024 06:53:52 +0000 Received: from SJ0PR11MB5648.namprd11.prod.outlook.com ([fe80::c784:dce5:4b7b:54f]) by SJ0PR11MB5648.namprd11.prod.outlook.com ([fe80::c784:dce5:4b7b:54f%4]) with mapi id 15.20.8293.000; Fri, 27 Dec 2024 06:53:52 +0000 From: Deepesh.Varatharajan@windriver.com To: openembedded-core@lists.openembedded.org Cc: Shivaprasad.Moodalappa@windriver.com, Sundeep.Kokkonda@windriver.com, Deepesh.Varatharajan@windriver.com Subject: [PATCH 2/3] rust: Fix for duplicate libstd.so Date: Thu, 26 Dec 2024 22:53:36 -0800 Message-ID: <20241227065337.1257972-2-Deepesh.Varatharajan@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241227065337.1257972-1-Deepesh.Varatharajan@windriver.com> References: <20241227065337.1257972-1-Deepesh.Varatharajan@windriver.com> X-ClientProxiedBy: BYAPR03CA0011.namprd03.prod.outlook.com (2603:10b6:a02:a8::24) To SJ0PR11MB5648.namprd11.prod.outlook.com (2603:10b6:a03:302::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5648:EE_|DS0PR11MB8133:EE_ X-MS-Office365-Filtering-Correlation-Id: b282df2f-b4fb-4d8c-aa15-08dd26433996 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024|52116014|38350700014; X-Microsoft-Antispam-Message-Info: zBZVCg/8Bn7wI4jeRuvejDpl3kGS23PM3xqldpXsm8jQG92fGLtw3/dqyl2oQAkhLDUdpskaApz04pNUB2zB7kPKpiXOIxAHbeDii+Qmd8JwCRfKRolNGvt3d/0KIBE9/h7NFxhMpHaYRenTN9Loxjin7nSxp2zzWOmstijdQwBRQz34kqcrvv/W7RplrKfZPinlrlZxbXDKwksBrpDSI547glDWJwtKxAnI90syrStSUFhTp0QIm7U7h9M8knWTy33XHdHhiyGifVAjPZpqQO9tYUdNVRGDQwc3sajUtAwvlWl8BwXfcbfC+syiMbbbypDk0YnnoTxujam4HluNT9W6UTvvLlsvd9XsKqttaTMCEfUaEOtVYwGwtrpIQmw9X61ZJyDhVPNihYqvKyiwBBICNdszG3l+zNFzydvyiNUZa8u9mfIUgyZkryM5qaOVTrxzRrLK5WAZRmNeeGAs3if2JckTTSQjRATaA0GjPoEachBVVlHuuckqF36VfmGdjteM/xaq3xKn6pe/sf3gMg2sknhyREkwmc4MMSV1zsiCeBF/i7NFLqLsHMKCwZROWlFdH1CN8VtNJkkYDy/Z+5jRYApST8KWqWA7CntUdL/wGMWvD5B+jzzxgNw/0fweLBa1W4I5RSdhtdwL8XfLIcXYQMJrWUfhFURrQrZfGHTmT5HqYdflXTb97PXvf1uIrfynmDK6fk1hKGiREL/hSMx05IiQcwpF01L98lvFrj+RwdZNDj6wfJSAhbGOHr8MVF1iNYQWwoTaainGRPOj4QCbIcbvyXPXLNGz8jHRXIVKpwxB72xS2B6PWuw7FwOfYwV9Fl/qjXQExZlyI6t0dCNmViJvQfMKSzNNDHg6HPDcYru5iSs5VJw1K23fQK5MWWZIYSq9U27VRNi+u1jWkiMq/huP0jwTr232Imy3z3yDMhZhE53/IbDuiup5OGq2V30DeicpMHwlQgSJV9CXuKsqiEjZl1AZ31JcUEEwr1Rm0e00bPI5egzWrVyeHQqYTrmB6v8zsagBjwgHg+wISObpy/NafxW5K1mcpu852H+3+YVAt8iOijpMJ/vJrU4JCuEEVa0dtMRMTmuYcgp0evg0+fOD031ZgcxmMi1wH55OtAyhR0sfvvvH3aSk7Qje64JSpjpu9DdyT4VophEpXgMvRvNx19YLGL3PY7xeRP0sozdbCwGs5MmY4vRPOIR+wXrIyoNzHy1ny5DD9tbBMfSojAmqM4hvgRscYaM+ScLBmkoDlGNDuDcZNdYjEkoBZMMeGn70PUd5rS3G3IQYXhkmj24DgsOYFW20DJR6zmGyrYF8RO0CzCPL7kx0+2kL74f2ZKYXrtMh5/ltwxf3AiX+v+oSYM0NAEe2wOtAThYi5zRWZ3FboagN8qqMkrWPuJ+Hpe1NOX5CcFxkO1zpIpMjHTn+lcPIE88S19RBpYRPFb4+i/CGb+PLs1Asy1F3 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5648.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o74Dk9dIs1seMrXSYR/eMvp0EACVQ+4/j7/8X0LUbdQaMvmzvhjnM+LlS4cKIyOxVam5sUKx++xLddmuW6rDnTdlhhvz1OR1w8UzxrIk4ZL4c/9gU6zCYDVwO5GSJLkyZDXaRNFePsXTFVWG80sK/uPz7/iPdnPv17Ju0/XXy7bEBAmDDqtj43GWez/ZF7tPjs8Zazg5UYVi4foJpjQ8t92uQLQVrEoJv9JKLbiad3xWJSdIuiP9F1tN/SSYRGtIrqvlLvGNsMakRJS4SPd5CLYAq+5GfD5pT0tQtWZ4Uxv1kucrWsROqOunQNXqkYxjnvh4g5FjpIZBLP5UPOSB2219DANaOyitayDNI1F5bGd0gB/dCi+fmmIpCErK/0qLY4S2I7e9YuqbPWzMu7LHBIgv2ngBYFGLfBFGUaL51SKYNeKwj2mZQM0naEuh1YRObgmDwB0+Y5UsrLPUUdXSZKdXLtjRmwb4cOQuER6jskYaQG3nI9wdMyfeII9AK0liScNfiC1kVj9ZBxJxYsGEcyp7jHcq9O84dCo380aAiS887W3Xn2YtKoaxV8yz5GzXUzTP9qTUymjcttN6XyG0ghXNM06yL7NnWAxJTSnlFBCt48UQYbP8LviN36UdBfZHJwg1ge5azFK0/ARCQjpPWviDe0nOVbbMWQN3o4Up84Y3HPgzQ0+HLh5tfG/n9xtpyMsr27HDVYLn7un2NUKSpZAmC5Q8upqim1Df7m+Sti6/Mqws4w2HUHBD5jNDzQl7AIhvPOQeIOTU1NbC0i31/IBS7AyQYO7tiUydvBypRaOc4BtAkvpllg4nBr+DRUSmOul8kOTp4/rfNrqon9uiSbQv7/aeF807bBQi9U4yLtrzFEEO0sK1fl65mhQoMfWf9DjTtk8C+YJXCJFIVqBJe1852+o4q5WKDdiLTd7PJ9pSo4TxzM0T0nCm+gvHrC+mA/pZO02aN8ojXBhLRq4kbMZCy//eKmU4Lt0r15L34vLkPW1o//GXnse8OlUHk1b9qvW1wGpAn3lzMfmxUpdIYdtw1Q+s/aNZRVWsAG7Uj1Jv7hlGKL/qTgWGa+m9FTzEWjrTmqv3K0Tqky65hoCFuEp/lV0aUU4BB3IGfjjQOUpE5jBF1vlC2iIIyI4UcGMvicBv+HN7kY+YYA02c1Uk8zsb9bAfgUJc96OENR4v1ZgME+yElIqC98nvN0c5cWcJKgLQERive7gEJe2csHmUHD0yaV4lvShJLZN1hT0regnjphYx6t1dnOQnGx6LidTdN3V3cuj801Wo5B90VX35AGIZBiT5cX5rN0K9HkQVw+PUUmNMw+OL0YlpZl4VtoFJyDfHc14tuZMEQNXX4ImxMisn4SQ0WV+PvxNah85ezPGFnR5iweNt6YITWp/GaoqipjdkG4CyuUpCceAI75cjjl3rClTIwqjI3y0YA9YBY+g1TP1b8+1vqZLW/tmEP3FT6kFZ1xqLmwXOiHJPtGss8JO7Ckkh0I+TaU/gJrb4c7+TYnxNGUdsBMI8CyaXwMmzdZffJwp9K44LMmHREeqw+2O2tG2DdyXJhd5OkbyuKPAy4q4PNrTUpNAkn6wg4hW1CA4sAMytPTOl8m7APMKClp1LxVqnj5Ltgl9Jrpld0sA= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b282df2f-b4fb-4d8c-aa15-08dd26433996 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5648.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2024 06:53:52.8043 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7VgfmtxcxTTgCn1+Rh/cFAek3taV0ZFF5JRT/AEDerqg6PcfoBIJ4WlCnQXp1FJe1rZxvDxEyquBR2zbQ5YyD6oHrgaOAOq8w6blkD8LSnQR6ABMR5/TsLOFH+7wk8cu X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8133 X-Proofpoint-GUID: aSKFApWOtpAfuiCs-s7BUgcYlQuXPwiu X-Proofpoint-ORIG-GUID: aSKFApWOtpAfuiCs-s7BUgcYlQuXPwiu X-Authority-Analysis: v=2.4 cv=CeHy5Krl c=1 sm=1 tr=0 ts=676e4f06 cx=c_pps a=Odf1NfffwWNqZHMsEJ1rEg==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=RZcAm9yDv7YA:10 a=bRTqI5nwn0kA:10 a=t7CeM3EgAAAA:8 a=JZ-T-SLG2RnevwI_bg4A:9 a=-tu3t9Ey6INAYvtyu7WB:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-12-27_02,2024-12-24_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=697 spamscore=0 adultscore=0 suspectscore=0 mlxscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2412270058 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, 27 Dec 2024 06:54:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209095 From: Deepesh Varatharajan The `do_package` task fail with below error due to multiple `libstd.so` files installed in lib dir. --------------------------------------------------------------------------------------------------------------------------- ERROR: rust-1.81.0-r0 do_package: rust-rustdoc: Multiple shlib providers for libstd-20c3de2d9292cd03.so: rust, rust (used by files: poky/build/tmp/work/core2-64-poky-linux/rust/1.81.0/packages-split/rust-rustdoc/usr/bin/rustdoc) ERROR: rust-1.81.0-r0 do_package: rust-tools-rustfmt: Multiple shlib providers for libstd-20c3de2d9292cd03.so: rust, rust (used by files: poky/build/tmp/work/core2-64-poky-linux/rust/1.81.0/packages-split/rust-tools-rustfmt/usr/bin/rustfmt) ERROR: rust-1.81.0-r0 do_package: rust: Multiple shlib providers for libstd-20c3de2d9292cd03.so: rust, rust (used by files: poky/build/tmp/work/core2-64-poky-linux/rust/1.81.0/packages-split/rust/usr/bin/rustc) ERROR: rust-1.81.0-r0 do_package: rust: Multiple shlib providers for libstd-20c3de2d9292cd03.so: rust, rust (used by files: poky/build/tmp/work/core2-64-poky-linux/rust/1.81.0/packages-split/rust/usr/bin/clippy-driver) ERROR: rust-1.81.0-r0 do_package: rust: Multiple shlib providers for libstd-20c3de2d9292cd03.so: rust, rust (used by files: poky/build/tmp/work/core2-64-poky-linux/rust/1.81.0/packages-split/rust/usr/bin/cargo-clippy) ERROR: rust-1.81.0-r0 do_package: rust: Multiple shlib providers for libstd-20c3de2d9292cd03.so: rust, rust (used by files: poky/build/tmp/work/core2-64-poky-linux/rust/1.81.0/packages-split/rust/usr/lib/ librustc_driver-fc36770e343ef852.so) --------------------------------------------------------------------------------------------------------------------------- To fix the redundant `libstd.so` files are removed from the usr/lib/. Signed-off-by: Deepesh Varatharajan --- meta/recipes-devtools/rust/rust_1.80.1.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/rust/rust_1.80.1.bb b/meta/recipes-devtools/rust/rust_1.80.1.bb index eae1f28bb8..2118c2fe9d 100644 --- a/meta/recipes-devtools/rust/rust_1.80.1.bb +++ b/meta/recipes-devtools/rust/rust_1.80.1.bb @@ -271,6 +271,7 @@ rust_do_install:class-nativesdk() { rm ${D}${libdir}/rustlib/uninstall.sh rm ${D}${libdir}/rustlib/install.log rm ${D}${libdir}/rustlib/manifest* + rm ${D}${libdir}/rustlib/${TARGET_ARCH}-pokysdk-linux-gnu/lib/libstd-*.so } EXTRA_TOOLS ?= "cargo-clippy clippy-driver rustfmt" @@ -294,6 +295,11 @@ rust_do_install:class-target() { rm ${D}${libdir}/rustlib/uninstall.sh rm ${D}${libdir}/rustlib/install.log rm ${D}${libdir}/rustlib/manifest* + if [ "${TCLIBC}" = "musl" ]; then + rm -f ${D}${libdir}/rustlib/${TARGET_ARCH}-poky-linux-musl/lib/libstd-*.so + elif [ "${TCLIBC}" = "glibc" ]; then + rm -f ${D}${libdir}/rustlib/${TARGET_ARCH}-poky-linux-gnu/lib/libstd-*.so + fi } addtask do_update_snapshot after do_patch From patchwork Fri Dec 27 06:53:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Varatharajan, Deepesh" X-Patchwork-Id: 54705 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 1D6BCE7718B for ; Fri, 27 Dec 2024 06:54:09 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.9050.1735282441694782708 for ; Thu, 26 Dec 2024 22:54:01 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=2091c24697=deepesh.varatharajan@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4BR6834t002033 for ; Fri, 27 Dec 2024 06:54:01 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 43njw0wat8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Dec 2024 06:54:00 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=geh6h/D5TNlYwZU1tPFSnrBDM004qMTOua90O4chA2el7RxpAIdnqWNPwXJ1OMVLCA+A73vNaRpdMEpSWWsTP1iX+WoUoQntHpxSWBSXIdNo5ebEL6n+tQ1SadcdOHC2Yj9AGsmmH3cI2S96CliIaW6rfV+7e/ggCTdGsk81kGdYKyt21NYs+U80GBOw54d8cGoCqWLX89VbSxGAdOYvI4Vy+8iZp1wAKHzPFZGZiSzMZv9UOL43uhTxJ9WsOenIrYSfIH5q1BhFLftVxcVHbNQ/JvqTu7tvaSsnAaSALvbLttESuht5d7nAswWmCpYP6XATSlnNXG9goCq+NLI3KA== 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=gMLFiW+Y9g4aP389qguAs/pWOVpVSE67b7fz52Oj100=; b=KZi8EaPWHXtZcCnTvnhEVdUAQ+jPjsTVMqP6ZlRWNgMrAXCclrqHk8BLZqHwZnC/qvotn+ei+d28rmJksIbCfpccINJL4t/6UC5mq9gMHMnfG4/yBNQfss5MwhaU9Q46waErAHHu/PU1SA5GvQQH0F+bQFdMBnQiCvWWMHDhFfDXgTLxVI1Be0RmDQJHGS4ML1h8ttxOB1PJjT5Q0rbifVzVU0BUk5i0NxCwxgDwyWiDikacU0RY72vRRVWESOLjt6eTjbOURA0uUdj6os7CujnLchwKzlN/XdjEHWEMiJbf9xMFb7Mxw3je+fW0mFhU9VcRIDLA+yw0UvrlFW1+yA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB5648.namprd11.prod.outlook.com (2603:10b6:a03:302::11) by DS0PR11MB8133.namprd11.prod.outlook.com (2603:10b6:8:15b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8293.14; Fri, 27 Dec 2024 06:53:54 +0000 Received: from SJ0PR11MB5648.namprd11.prod.outlook.com ([fe80::c784:dce5:4b7b:54f]) by SJ0PR11MB5648.namprd11.prod.outlook.com ([fe80::c784:dce5:4b7b:54f%4]) with mapi id 15.20.8293.000; Fri, 27 Dec 2024 06:53:54 +0000 From: Deepesh.Varatharajan@windriver.com To: openembedded-core@lists.openembedded.org Cc: Shivaprasad.Moodalappa@windriver.com, Sundeep.Kokkonda@windriver.com, Deepesh.Varatharajan@windriver.com Subject: [PATCH 3/3] rust: Upgrade 1.80.1->1.81.0 Date: Thu, 26 Dec 2024 22:53:37 -0800 Message-ID: <20241227065337.1257972-3-Deepesh.Varatharajan@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241227065337.1257972-1-Deepesh.Varatharajan@windriver.com> References: <20241227065337.1257972-1-Deepesh.Varatharajan@windriver.com> X-ClientProxiedBy: BYAPR03CA0011.namprd03.prod.outlook.com (2603:10b6:a02:a8::24) To SJ0PR11MB5648.namprd11.prod.outlook.com (2603:10b6:a03:302::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5648:EE_|DS0PR11MB8133:EE_ X-MS-Office365-Filtering-Correlation-Id: 85b593c1-d00d-46ff-1d57-08dd26433a9d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024|52116014|38350700014; X-Microsoft-Antispam-Message-Info: KrhFPIHSEsWuia1plMldSyRDuA7zy5KxmEJm75tRkfpJjJxqKTswTmrLDJmDzWEesdMTDSh3vB96npoKg9EO/hGSZRYmmGjYsOmafF+Eyr6x9/UVMg3ECoCPbGZ4H3xORbyq7xOGatY9kCyxdQ5DOdklykMpqjdh37dZ55QCvTjN9qnTXn5qykSUDDxHA+7jGWZcJpb+tw+HLgv73EvTuTSdjqJ1TS0OWBlDnioQiatYDczTZd4kUQtosup874csJxIrjx6YaeFXlKkcflCLJo99ZRopiLUkpvqqrag9yW01uoh7ip+qR8YH69U0XwpC3vXcla7fAoUzwwb+jwvp03c0QSR/fsB314K47sMdbpsKHQud+QginO0GV+/17/A2hwVN4pW+YbnVp6+3XAnNsmGymQI39E1hmAf0OJaReDs8C9fOpQ3r6z0R/AbG0W+o6WkbWtVUez6LBpSHqR7RUiOIy6iELoxiMo76iPAJB/7YaQIUVuT3CTTgFIEAX/lVlKm88f7eCjp+icq6Sg9q3PcYy5J3HzpZoFG5np+4W4dUkvCFZ82vvXcluLiU4WJpfeHyxzMA0ylTDAkGLX1Xn350dcPFnL4imzMdnKhRRrKqPt8rGgjKOJDNEtpIUtHgMrqjsOhT9CImB8entY0oq8EZ0NTLGZ1NSqXI2Dzweq3/Wm+LeIJSHnwFlkGNVBSfhO6eUGh4I3HUQ99rsd7r+FilUzDDoQd+FrzECnd7vPeYKKaWojqwWemn2o/qRmwQiBKSF/5uIqy407kP/cjC0k6w4iPOIlmTc8OptvAXdPJbK/CiXK6KJV7VEdDPYsnD4owQ7eCZBM/EFDHGNrZr/j/jJO4LojZ9Nz2MzGLnab9zNnqpFEwOb+/wRz6nu13Fcl0Sbbruw762ik5Lja5FEHbrr5VbvnkuK70LfmaT1Xr5iq0kAxjdGulHBZKh2BGQiIZVgGBQLd5ch9U1VFDvW+BXwQTlqqKMLomSR+7Lmn28NILjSsIq37+rJqNVRIFHRo6cme/WrixAAtQW1P62JGg5sdVSQwAbL/w4WrhAw/aBB04TnzUwOQYga6/W4N5nLHcOX6beFLyHmA24gj5QIUKeBlAQcG9AnJWZZSvwsgppt0Y7sVKL/3vk2e6Gimv1C8T7ikqBPwjegFH/P1kU+Ztvjkc+hwSm+Vbc7bwYAyq7nUS4lXNuipbtptj8vlpqDgnP1YzEPgraXk47VKdxmKPqUXGZlUKEKFuE2k2JaKDdcsxttm+SFF91wD8q9xtuBQKSkgHN60KxSMTALa5ob2dwPtE5OVfA8lzBpFsaJq48tQ06rknxx5bQWThukRpWsry7H11iTej790wBbITFvqR2RO9wUPLLviu2zoBFtwT+xmPMFcPYlz1ZpZLh4l23Dr9LMu3lVCBI8g8RLn9dIA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5648.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +gxjIAY9TTmtd0iSMIN1hQTXKIEz35I7IZo+1Re6iZXVgAV4KBCNUEpfvMX1KnjEz+jeLa7EZ1gVoAqk1IhU/sG+8zKq8uW9h/96a4gWyFMe0e8qH2BacT2JiHwsybprwhMd0ee48XNsyo6RNxQ0m7gb5BtoDEqlp+46qt7lIx1nXnX1BRnExBAGWJo1WxvxIz7Tu/VSh+QlmxrVschk5CvMNptTrH86ZjVVVAQ9FduJyiQx1AohPcbIIGZbqTNvvHSEbKJBYYTeT/nnqu3TRWi4gjJO8WiVO1IjdEFTFaE7/2GVbVsTJdIze8Wl/t7glQ19ZwTLBL7UTiiFyoy6bKdOZvfeopdzQmffuhU4gBj/j3Cj5xXbFSS4cmBVQgh8KG33l45eyys6NqZARDMhLisspQCVDcATfujYpw2ANMoz5gnj2REBhj7BkfbBWLYRX2ZLvL6GNZ+hN6EjxxINlUTP52NiIx6jZ/vLuJG0uwtRMpJw9WMC1FVHxtCM+AKKF1dcOTEDnBFCgOdCL98b96SWIREw4Yp4fl9AchmidoH/sP7nqx95QjqTPiYYeuVUVsSVO0vhMoPsKWwM9tbOyXSc1dLlvmAFbhh67XpbZP3fRqllba2yOgHXOAYLgNWD/Flw6YUH+Xcwb0p60oMd3agDezIZD25IsZx+EPFG64WTtR7g2PZKHz5uRWZzMWfT99Rn8VLqWnHYLNQDqfO21s7pj6EYVlhHCscBRgbpJBbg4OXjLDdCNtgIuergaa1xEXdGDx2VWYoaGbfaDPCHEfsl5SaRjei09fboSxzGTVaXo4tu0D+Wi/AFK2PnYM6pUR0ox3C0DbkVcBIKZX4EDPQ0PagDvBo90vQatrM8kk0kGjh/08PKa/3XmUtq5nKSBEf5XeBxX5to8P8Hlq5AqaGeZKB8swQ2tmn3xD8P2oLkN7/QFpzIQHhJQGO/NvLZg4CNlWObocVaKpSFvhn21xzGKmuBEYu+7UqGNbfRW/Zk6/5nXvsIDEvnpRTC/7ijilsk/QssSLnt1QB6kPwcQPlahnfP4sW3YQ0XxJxyqEQ87+juwwdEBcPg3oSEHODUkTaheCTeXJB7GSh0pPny+zsLyZqm8K7LggCXiT0VNtP8CuLO//zKI3lO9j+F7wQjDALssTYpXMf/jN+R8arkxZkEaK+N8wFFbxdBC/4rdiwz6XYVtcuDH3IX+gpIS2ImsBckiIA+fD8xAAlV5iUMddJTk9ubkP4jz/0LjrakB6XFE3/WgfLDesmB15p+JSw/se2y585Zvldpfnwq8Gg53u+ubz8gMpD8oF3heZVNIlhgLz0avrVtLqmqb9l81tSPtS0QioqF3lQQNjGRU9X/ndR6IcreUysU6IRH6IFdeniz2+oTKbb7JhahqE3TNG2XuvQHg7rZArQqvX3lddwkyFoKEOG+iFatSZMjqen+0bPiMLCrwtws4T2Jm2xU1+k1pliNkZEsF5x2iZ8o6HeWsWp446kmF5uGW9hsVx1aK8vRo4dLr7AMq1HDY2gC+sCr/W/6jpA1vl6R3Z2vCLPZW68ZkN5eNPDtq+FLkYgXcZ7cNgMb15ATvLwarNNMaJkDSUy/4aTPuDai6NKjfoeLLGPIlQ3XJa3YKaTkLIDtrwE= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85b593c1-d00d-46ff-1d57-08dd26433a9d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5648.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Dec 2024 06:53:54.5547 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: aNtbA7E5kCms2jopIgQohER+Z2BdYkdjmcX0ZBa/wrXNr/LLjGwLgLc6YOjLb2CpgaYCGZieAZhSkCN+m1BKinn8dbYlDPXNy1j8PlJOiSI/6xmeN/+AxudLI+WFM/5n X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB8133 X-Authority-Analysis: v=2.4 cv=Yc5H5xRf c=1 sm=1 tr=0 ts=676e4f08 cx=c_pps a=9T78G36u1E64A7MtQSounQ==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=RZcAm9yDv7YA:10 a=bRTqI5nwn0kA:10 a=ei4SEBeUAAAA:8 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=ag1SF4gXAAAA:8 a=pGLkceISAAAA:8 a=navRoStkKKgR38ecjcUA:9 a=f8od9IJyfylVoEKq:21 a=On0Qz11iJF4A:10 a=8zIOOLb7Ym0NljyPXbuS:22 a=FdTzh2GWekK77mhwV6Dw:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-Proofpoint-ORIG-GUID: lkhtklTdaGI6v5xuzWtSwqHOcdoi23Zu X-Proofpoint-GUID: lkhtklTdaGI6v5xuzWtSwqHOcdoi23Zu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2024-12-27_02,2024-12-24_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 lowpriorityscore=0 priorityscore=1501 clxscore=1015 bulkscore=0 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.21.0-2411120000 definitions=main-2412270058 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, 27 Dec 2024 06:54:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209096 From: Deepesh Varatharajan https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html Dropped: 0001-cargo-do-not-write-host-information-into-compilation.patch hardcodepaths.patch Signed-off-by: Deepesh Varatharajan --- meta/conf/distro/include/tcmode-default.inc | 2 +- .../rust/{cargo_1.80.1.bb => cargo_1.81.0.bb} | 0 ...te-host-information-into-compilation.patch | 51 ------------ .../rust/files/hardcodepaths.patch | 46 ----------- ...epro-issue-fix-with-cc-crate-hashmap.patch | 53 ++++++++++++- ...ibstd-rs_1.80.1.bb => libstd-rs_1.81.0.bb} | 0 ....80.1.bb => rust-cross-canadian_1.81.0.bb} | 0 ...ust-llvm_1.80.1.bb => rust-llvm_1.81.0.bb} | 0 meta/recipes-devtools/rust/rust-snapshot.inc | 78 +++++++++---------- meta/recipes-devtools/rust/rust-source.inc | 4 +- .../rust/{rust_1.80.1.bb => rust_1.81.0.bb} | 0 11 files changed, 93 insertions(+), 141 deletions(-) rename meta/recipes-devtools/rust/{cargo_1.80.1.bb => cargo_1.81.0.bb} (100%) delete mode 100644 meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch delete mode 100644 meta/recipes-devtools/rust/files/hardcodepaths.patch rename meta/recipes-devtools/rust/{libstd-rs_1.80.1.bb => libstd-rs_1.81.0.bb} (100%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.80.1.bb => rust-cross-canadian_1.81.0.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.80.1.bb => rust-llvm_1.81.0.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.80.1.bb => rust_1.81.0.bb} (100%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 8ccef0a4d8..c0817a2bf5 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -24,7 +24,7 @@ GLIBCVERSION ?= "2.40%" LINUXLIBCVERSION ?= "6.12%" QEMUVERSION ?= "9.2%" GOVERSION ?= "1.22%" -RUSTVERSION ?= "1.80%" +RUSTVERSION ?= "1.81%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/rust/cargo_1.80.1.bb b/meta/recipes-devtools/rust/cargo_1.81.0.bb similarity index 100% rename from meta/recipes-devtools/rust/cargo_1.80.1.bb rename to meta/recipes-devtools/rust/cargo_1.81.0.bb diff --git a/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch b/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch deleted file mode 100644 index 7579ea0b5f..0000000000 --- a/meta/recipes-devtools/rust/files/0001-cargo-do-not-write-host-information-into-compilation.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 065d7c263091118437465d714d8a29dbb6296921 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 13 May 2024 14:57:54 +0200 -Subject: [PATCH] cargo: do not write host information into compilation unit - hashes - -This breaks reproducibility in cross-builds where the cross-target -can be the same, but build hosts are different, as seen with -"rustc --version -v": -... -host: x86_64-unknown-linux-gnu - -vs. - -host: aarch64-unknown-linux-gnu - -This can possibly be improved by only hashing host info if the build -is a native one (e.g. there's no --target option passed to cargo -invocation) but I'm not sure how. - -Upstream-Status: Inappropriate [reported at https://github.com/rust-lang/cargo/issues/13922] -Signed-off-by: Alexander Kanavin ---- - .../src/cargo/core/compiler/context/compilation_files.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs b/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs -index d83dbf10c..b2ad8d9f3 100644 ---- a/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs -+++ b/src/tools/cargo/src/cargo/core/compiler/build_runner/compilation_files.rs -@@ -652,7 +652,7 @@ fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher) { - if vers.pre.is_empty() || bcx.gctx.cli_unstable().separate_nightlies { - // For stable, keep the artifacts separate. This helps if someone is - // testing multiple versions, to avoid recompiles. -- bcx.rustc().verbose_version.hash(hasher); -+ //bcx.rustc().verbose_version.hash(hasher); - return; - } - // On "nightly"/"beta"/"dev"/etc, keep each "channel" separate. Don't hash -@@ -665,7 +665,7 @@ fn hash_rustc_version(bcx: &BuildContext<'_, '_>, hasher: &mut StableHasher) { - // Keep "host" since some people switch hosts to implicitly change - // targets, (like gnu vs musl or gnu vs msvc). In the future, we may want - // to consider hashing `unit.kind.short_name()` instead. -- bcx.rustc().host.hash(hasher); -+ //bcx.rustc().host.hash(hasher); - // None of the other lines are important. Currently they are: - // binary: rustc <-- or "rustdoc" - // commit-hash: 38114ff16e7856f98b2b4be7ab4cd29b38bed59a --- -2.39.2 - diff --git a/meta/recipes-devtools/rust/files/hardcodepaths.patch b/meta/recipes-devtools/rust/files/hardcodepaths.patch deleted file mode 100644 index 696654227e..0000000000 --- a/meta/recipes-devtools/rust/files/hardcodepaths.patch +++ /dev/null @@ -1,46 +0,0 @@ -When building for the target, some build paths end up embedded in the binaries. -These changes remove that. Further investigation is needed to work out the way -to resolve these issues properly upstream. - -Upstream-Status: Inappropriate [patches need rework] -Signed-off-by: Richard Purdie -Signed-off-by: Alex Kiernan - -diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs -index b4b2ab1e1f8a..8bb3e3f0557c 100644 ---- a/compiler/rustc_codegen_llvm/src/context.rs -+++ b/compiler/rustc_codegen_llvm/src/context.rs -@@ -34,7 +34,6 @@ - use smallvec::SmallVec; - - use libc::c_uint; --use std::borrow::Borrow; - use std::cell::{Cell, RefCell}; - use std::ffi::CStr; - use std::str; -@@ -155,25 +154,6 @@ - } - } - -- // Ensure the data-layout values hardcoded remain the defaults. -- { -- let tm = crate::back::write::create_informational_target_machine(tcx.sess); -- llvm::LLVMRustSetDataLayoutFromTargetMachine(llmod, &tm); -- -- let llvm_data_layout = llvm::LLVMGetDataLayoutStr(llmod); -- let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes()) -- .expect("got a non-UTF8 data-layout from LLVM"); -- -- if target_data_layout != llvm_data_layout { -- tcx.dcx().emit_err(crate::errors::MismatchedDataLayout { -- rustc_target: sess.opts.target_triple.to_string().as_str(), -- rustc_layout: target_data_layout.as_str(), -- llvm_target: sess.target.llvm_target.borrow(), -- llvm_layout: llvm_data_layout, -- }); -- } -- } -- - let data_layout = SmallCStr::new(&target_data_layout); - llvm::LLVMSetDataLayout(llmod, data_layout.as_ptr()); - diff --git a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch b/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch index e3f57e764c..e052c32b81 100644 --- a/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch +++ b/meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch @@ -1,4 +1,4 @@ -rust: reproducibility issue fix with v1.80 +rust: reproducibility issue fix with v1.81 A few crates are using the updated version of the 'cc' crate and this is causing the generated object file names containing a unique hashmap id. By the following changes same hash values will be genarted even for diffrent build paths. @@ -49,6 +49,57 @@ Signed-off-by: Harish Sadineni let obj = dst .join(format!("{:016x}-{}", hasher.finish(), basename)) .with_extension("o"); +diff --git a/vendor/cc-1.0.99/src/command_helpers.rs b/vendor/cc-1.0.99/src/command_helpers.rs +index fe919a5239..2b1f442019 100644 +--- a/vendor/cc-1.0.99/src/command_helpers.rs ++++ b/vendor/cc-1.0.99/src/command_helpers.rs +@@ -257,6 +257,7 @@ fn wait_on_child( + /// and store them in the output Object. + pub(crate) fn objects_from_files(files: &[Arc], dst: &Path) -> Result, Error> { + let mut objects = Vec::with_capacity(files.len()); ++ let target_substring = ["rustc"]; + for file in files { + let basename = file + .file_name() +@@ -277,10 +278,29 @@ pub(crate) fn objects_from_files(files: &[Arc], dst: &Path) -> Result Option { ++ let mut pos = None; ++ for target in targets { ++ if let Some(index) = s.rfind(target) { ++ //If a target is found and pos is None, set it ++ if pos.is_none() || index < pos.unwrap() { ++ pos = Some(index); ++ } ++ } ++ } ++ pos ++ } ++ ++ let filtered_dirname = if let Some(pos) = find_target_position(&dirname, &target_substring) { ++ dirname[pos..].to_string() //Keep everything from the target substring onwards ++ } else { ++ dirname.to_string() //If target substring is not found, keep the original dirname ++ }; + // Hash the dirname. This should prevent conflicts if we have multiple + // object files with the same filename in different subfolders. + let mut hasher = hash_map::DefaultHasher::new(); +- hasher.write(dirname.to_string().as_bytes()); ++ hasher.write(filtered_dirname.as_bytes()); + let obj = dst + .join(format!("{:016x}-{}", hasher.finish(), basename)) + .with_extension("o"); +diff --git a/vendor/cc-1.0.99/.cargo-checksum.json b/vendor/cc-1.0.99/.cargo-checksum.json +index b070eeb322..ba768ff86f 100644 +--- a/vendor/cc-1.0.99/.cargo-checksum.json ++++ b/vendor/cc-1.0.99/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"3c555dbe1a698f12b66c8a5748ed52ff26ff7b8ebb12237c1a72a1cbe4b9392e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"15afbc35930a5a53f00d74a8910cff35caeb5511c26642cffe5630377aced901","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"92440d3adb5cb6ea05596d9ca860a205d3937dbf0fc959e524bac5f2b748c1af","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"352a0295c965c684904329d334f3b9889db3a9c3f201701f8db44e4d00e00515","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"342be00f6215e161d8163e272a2945bb9f52f171648e15e11d46800a73186955","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"e13c439a96d8311ba8d37b9d5522cd6997d94261cbb95517c82df70525acaa7f","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"4c350cddbce1557682b7f40cd917cc4f131ad89ff2e34c23d629014ed8d7203e","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"} +\ No newline at end of file ++{"files":{"Cargo.toml":"3c555dbe1a698f12b66c8a5748ed52ff26ff7b8ebb12237c1a72a1cbe4b9392e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"4c4a9ea55a109dbeada9e23d4ec963c257a56451b5fd16c7e4e8b97374f1a2ff","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"92440d3adb5cb6ea05596d9ca860a205d3937dbf0fc959e524bac5f2b748c1af","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"352a0295c965c684904329d334f3b9889db3a9c3f201701f8db44e4d00e00515","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"342be00f6215e161d8163e272a2945bb9f52f171648e15e11d46800a73186955","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"e13c439a96d8311ba8d37b9d5522cd6997d94261cbb95517c82df70525acaa7f","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"4c350cddbce1557682b7f40cd917cc4f131ad89ff2e34c23d629014ed8d7203e","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"} --- a/vendor/cc-1.0.97/.cargo-checksum.json +++ b/vendor/cc-1.0.97/.cargo-checksum.json @@ -1 +1 @@ diff --git a/meta/recipes-devtools/rust/libstd-rs_1.80.1.bb b/meta/recipes-devtools/rust/libstd-rs_1.81.0.bb similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs_1.80.1.bb rename to meta/recipes-devtools/rust/libstd-rs_1.81.0.bb diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.80.1.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.81.0.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-cross-canadian_1.80.1.bb rename to meta/recipes-devtools/rust/rust-cross-canadian_1.81.0.bb diff --git a/meta/recipes-devtools/rust/rust-llvm_1.80.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.81.0.bb similarity index 100% rename from meta/recipes-devtools/rust/rust-llvm_1.80.1.bb rename to meta/recipes-devtools/rust/rust-llvm_1.81.0.bb diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc index 66d777f623..4446863576 100644 --- a/meta/recipes-devtools/rust/rust-snapshot.inc +++ b/meta/recipes-devtools/rust/rust-snapshot.inc @@ -4,56 +4,56 @@ ## The exact (previous) version that has been used is specified in the source tarball. ## The version is replicated here. -SNAPSHOT_VERSION = "1.79.0" +SNAPSHOT_VERSION = "1.80.1" -SRC_URI[cargo-snapshot-aarch64.sha256sum] = "4ca5e9bd141b0111387ea1aa0355f87eb8d0da52fbc616cefa4ecde4997aa65b" -SRC_URI[clippy-snapshot-aarch64.sha256sum] = "77803cfff2ea0342f26b59eabec353bc43a1791012aa70855ecfea0fb7ae76ac" -SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "519abf4757fbd8d7e3bb4e4cfdc362ded972c1d95f04675684df2d31e8c0899b" -SRC_URI[rustc-snapshot-aarch64.sha256sum] = "9c847b42b81325d25a9240e33bf03fa8652f5dd321ae90a9a7a58b46bf124b17" +SRC_URI[cargo-snapshot-aarch64.sha256sum] = "a8c4f1ab2f65e7579eb80153fd1ca9a0b365ca31ca6ae0ebd34156e0724dfc60" +SRC_URI[clippy-snapshot-aarch64.sha256sum] = "3d522172f9797e65c609a640af7f4ac331525150c91f93e41798c5578e9523e9" +SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "8fc4bfc3a5fe64f8530964a5ea3bda95e39357eff14d6a8bb24f010ecc912923" +SRC_URI[rustc-snapshot-aarch64.sha256sum] = "fc21ca734504c3d0ccaf361f05cb491142c365ce8a326f942206b0199c49bbb4" -SRC_URI[cargo-snapshot-i686.sha256sum] = "57bd43f363ebd399a38aa4ac3b137e9172706770f8b23479f9dd859c6ae779ab" -SRC_URI[clippy-snapshot-i686.sha256sum] = "1d2612c829d946ca8ce32f2beacfde2c5ebed1fcacb720a58fb8e7786e4c82f2" -SRC_URI[rust-std-snapshot-i686.sha256sum] = "158294f7c424ef75d84046b573f225c15d531745cc79d416a18c11aa8253830e" -SRC_URI[rustc-snapshot-i686.sha256sum] = "4695a6eb66252d519510ca0a859803fff3a5041f71004404df0ccc9fbf0298d5" +SRC_URI[cargo-snapshot-i686.sha256sum] = "b0f6d95c8a292b1276f30b1bca14197b28297c2fcd51974ef320d05497be3ca3" +SRC_URI[clippy-snapshot-i686.sha256sum] = "a6899744ed734dd3a9f59631a943721bfe67ed6273e60dd67e8636820c1bfffd" +SRC_URI[rust-std-snapshot-i686.sha256sum] = "6547876dcf243aeeeadaa38dbdce02c316b6f83305a5337520e02eaffc90834b" +SRC_URI[rustc-snapshot-i686.sha256sum] = "b40c1437491d0a24756b6baabb14c2d4d0def199bc652f16e417addb171ac977" -SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "354d498a8e36abe6ebd7bd859c8c7e7f02b029aa1897b9b60a87e9902ebb1079" -SRC_URI[clippy-snapshot-loongarch64.sha256sum] = "88eab562705d56a246a09f2897cbae9e37a66dc3cc2cab52c781cd78024f2b52" -SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "88730b1b0d9c5252e041ed1fc2375d7292dc45132bcc8b6214490c578de240d3" -SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "f39a604e1a5a5ba1c7342c9d98c9952b5ba252cda4b55cc6ae7bd6fca72f3889" +SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "843272f7ab9b2f8c24f1747249275e0472fb2ede90f3a404e897559ddb898c18" +SRC_URI[clippy-snapshot-loongarch64.sha256sum] = "e4dba3b66bd8f811c8508fd3be1bf136b714018768d9f16a96f601ebd375bcc6" +SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "68f30f3743b573e205ecc1733e1250ffb8d8d81e131c3b2f4a819b7e1e610d62" +SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "5ae96e69573690aa48ffb9fecc62826ffb5d2fc280d19d1e54ab36ff48e28b68" -SRC_URI[cargo-snapshot-powerpc.sha256sum] = "2a55e97ce512c27a012720bb2a0cd86554c1d734b5cb91b98f58af167cc0fde1" -SRC_URI[clippy-snapshot-powerpc.sha256sum] = "1ae0bbe5835d9461a12f22d509787e6c11aac8335c677152a57a04f8d22cf755" -SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "6aa2f351bc7dccb544781f4fecddb5ef67e05bb310c84e0106d968231384d9f4" -SRC_URI[rustc-snapshot-powerpc.sha256sum] = "3b9a8067e97dd269a27fe91be163e046e85b47973f5d512c3368c49d332dacb1" +SRC_URI[cargo-snapshot-powerpc.sha256sum] = "a88402d95f2959caaff20037144d3109a69ce3310e1dfbb27231dacd50fa2988" +SRC_URI[clippy-snapshot-powerpc.sha256sum] = "ae1762dc8fd679d65154d5af9500c7539f55ec9d049ab736a910893d382fd6c0" +SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "88e8144c25ef8347471dd53eea7af62e5b31eadf0788f4a82be7560f5a0be255" +SRC_URI[rustc-snapshot-powerpc.sha256sum] = "5f435b48316a719c87fb27f49c0b37884cef7dd3ecba76df9db2a4008cc03458" -SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "1e2ffcc41a2083be2f4733d534d5ee0e05fc2ace1f21033792a4e2497cbbfbe4" -SRC_URI[clippy-snapshot-powerpc64.sha256sum] = "0bceeb8dc5b48e5ea9cff67cdcf8488fe2afe44d7e75ca04669c7c0c2e02a0df" -SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "af95929af71494ee3e6988ead07204ea05b6f2b729cdb1ffcc26db75e47bf318" -SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "2295d50425ed5dfb028560ac0f9a611212d8deb43791a1d199419043157ab95e" +SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "be2707eaa24f34775c98044f92c391a2c6037a2214adab9e83c62903001fb577" +SRC_URI[clippy-snapshot-powerpc64.sha256sum] = "a422a3b638c42f26ada441d2940a44a8c0f1ade9459f86d48a3d8fcc866bc60b" +SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "cb5ad871a0a7efe7c270cbf319d006a84e8f8526acb22ce941f2840fd0e368c2" +SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "e3257dc0790728498cf2773c3ca66d728381cc6d1f403969bd282223bd97aa3d" -SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "bec32adad9f2cd1650ed24ee82fccf7329c68243cdef7cef1e720ccaea097dab" -SRC_URI[clippy-snapshot-powerpc64le.sha256sum] = "6bb12041b6171e80598c0c04eb7e9bd07ab4fb4d654a9289618e3288a4d2f6c8" -SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "3b5d53d70837d5ec942ec41a8da37ed932bbdc1e53f78dc54e218db458701588" -SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "3b144840f179114cde3078909370bfb6928153d0ae303ac9848622c57cee3578" +SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "a523cf21d751be597a19830136e3479b7f22d3642d95f53f78a11e770d971d28" +SRC_URI[clippy-snapshot-powerpc64le.sha256sum] = "93ce75f4edf2c3b792714d33e279c5743d9d3ef841f8f2d8a7e76c9c7d74f952" +SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "06633b26384cba594424ec02acf0d64d4724033a856a2e039a18a518cacf1d3e" +SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "5f72f8723a2023b0bbd64cfc3d10959c4210b68579ad8e174809d17e1e2ead36" -SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "83e28f3e02cce4a9d19841bcb40ec0c8ad4e9af9fb215c39876028e6e9e6baf1" -SRC_URI[clippy-snapshot-riscv64gc.sha256sum] = "fbc978db4be2e6fdb1dbcb3ca00ee54c44dafd08930738f1c6aa7ae249685a34" -SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "2b8af4060acb10f347c66a3477ae92151beba12192590ea40723dcf9b1f7f5b2" -SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "1b952b8cd597060ac07bbe99cea382651ca6eee4ac2abe0a90303ccf2278e60e" +SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "29e996af02293562f6ee79032a5414fffbf77e75cb7f0ba89053849986cb6303" +SRC_URI[clippy-snapshot-riscv64gc.sha256sum] = "24465ce5fe8f04d9b54c31a2c5bcaba6d702925ac3cdec0af5b954643013db90" +SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "1fbbe8df7596682466ae2fca534d5f6bae8b3f32577450e2632955268a786a06" +SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "838d78ef8b9a11751b1dfb2cf2abfdc845deca8f0002c11930d54577b433cb93" -SRC_URI[cargo-snapshot-s390x.sha256sum] = "5663e6ea018a13f1c87ac74de267829952ea979fbe5f8ee5c1c3531e25d1749c" -SRC_URI[clippy-snapshot-s390x.sha256sum] = "c00bd892e0f29bbc2514f87c7521210ced8c175a41eee0a428e19a6ef157779f" -SRC_URI[rust-std-snapshot-s390x.sha256sum] = "d70e710a5138871e8d972f195ced9f7aa639ccef23a87fa03cc527d2b9c3cd36" -SRC_URI[rustc-snapshot-s390x.sha256sum] = "ef4b494fb7356b6e88a69b71378c04ae0f4a3c264adae84c9d4f3a1314eaa2b4" +SRC_URI[cargo-snapshot-s390x.sha256sum] = "0c22278b4e8afa79de0cae798575c9ef258e73d0555b18a84efd5d042c69c6e2" +SRC_URI[clippy-snapshot-s390x.sha256sum] = "52c3368de0e01b07f89f74a4b36279be1b7d2312b05253c7c9ccb50bc38f263a" +SRC_URI[rust-std-snapshot-s390x.sha256sum] = "e732ce690fd63e3c2576bfe83a556031c4805c17b35b8a1c1a0ddde5cee31d46" +SRC_URI[rustc-snapshot-s390x.sha256sum] = "0c06439db686645be36390969b503996608f25954eab2b7fd9a2915da6c0bd7b" -SRC_URI[cargo-snapshot-x86_64.sha256sum] = "07fcadd27b645ad58ff4dae5ef166fd730311bbae8f25f6640fe1bfd2a1f3c3c" -SRC_URI[clippy-snapshot-x86_64.sha256sum] = "3fb282ee97626e4f25c4f6faac3997859b89f13983dd6fa111e25182dfcb91fa" -SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "2c914483c0882d44af2e50a181cbd2c953d672d50b31aa669ee2346cade1f108" -SRC_URI[rustc-snapshot-x86_64.sha256sum] = "a04cf42022d0a5faf01c31082bfb1dde9c38409f0ca6da90a3e40faa03e797ae" +SRC_URI[cargo-snapshot-x86_64.sha256sum] = "da9340b3249f08656cd4fe10e47aa292c7cd79903870a5863064731a00b5b27e" +SRC_URI[clippy-snapshot-x86_64.sha256sum] = "e01d434e952821900f37824c797f87ed16db79e54fcbd2f396b2f1b5cb2e3c55" +SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "b793405538d8b6ec1632779efa8835b07b8987db2008c5c9c809bc4b17dcb121" +SRC_URI[rustc-snapshot-x86_64.sha256sum] = "0367f069b49560af5c61810530d4721ad13eecfcb48952e67a2c32be903d5043" -SRC_URI[rust-std-snapshot-i586.sha256sum] = "9c38f2cd4c19196fcf113166237ab03512bf19ce5a7f13c3bfe0e5cc3317eb44" +SRC_URI[rust-std-snapshot-i586.sha256sum] = "94927cdfa7cad391700b1a77730bb17aa364831ff6a6c40ce6500a14c1314647" -SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "f7c7a73a8e5640f9d5aca6b26866b4da08cf3d3509ed1c4184309fb868acbff2" +SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "ee7fa0104b019eec22750ac635e699d21dbb5430fc6982c495533900ec568d5b" SRC_URI += " \ ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index c39c954c49..8484c94ef8 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -1,17 +1,15 @@ RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}" SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \ - file://hardcodepaths.patch;patchdir=${RUSTSRC} \ file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ file://rv32-rustix-libc-backend.patch;patchdir=${RUSTSRC} \ file://rv32-cargo-rustix-0.38.28-fix.patch;patchdir=${RUSTSRC} \ - file://0001-cargo-do-not-write-host-information-into-compilation.patch;patchdir=${RUSTSRC} \ file://rustdoc-repro-issue-fix-cargo-config-for-codegenunits.patch;patchdir=${RUSTSRC} \ file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \ file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \ file://oeqa-selftest-Increase-timeout-in-process-sigpipe-ru.patch;patchdir=${RUSTSRC} \ " -SRC_URI[rust.sha256sum] = "6ab79b70dc57737a1de378f212fcf8852d67fe6cf272d122a15b3ea13be77947" +SRC_URI[rust.sha256sum] = "36217ef7e32f40a180e3d79bd666b4dfdaed49dd381023a5fb765fd12d0092ce" RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" diff --git a/meta/recipes-devtools/rust/rust_1.80.1.bb b/meta/recipes-devtools/rust/rust_1.81.0.bb similarity index 100% rename from meta/recipes-devtools/rust/rust_1.80.1.bb rename to meta/recipes-devtools/rust/rust_1.81.0.bb