From patchwork Fri Jan 19 13:43:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38059 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 8D34AC4725D for ; Fri, 19 Jan 2024 13:44:27 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.22313.1705671859858801805 for ; Fri, 19 Jan 2024 05:44:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=cWNQXb6E; 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.166.238, mailfrom: prvs=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JCeC5B016563 for ; Fri, 19 Jan 2024 05:44:19 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=PPS06212021; bh=tLe/Fh3IldcIiKhkti MhWzvgUMWF5t7FgVBKQCidzDs=; b=cWNQXb6Emdu8d8pm19926hVbUL68/JIBha P8N0N+3SF+/tX5E9vaVDb+BNDrWqWz7/VLG/ukKsmW78cIDBU15YjjPCIt41SiiC 25Q8lMSAD+Ddv1e84D6CeuyxAZ8DYU4FX3zeWPjjL3CLSH2MaWh8hA7sU+qITH6u I0Shl1nUyuPyuNW20QmfZBkdrFxALem3nZcTQNsfPoXo9odRnjv/6kljef9b8XjT AOCvY2X9aFBN3g8ZSNO5jh7oCQVC+o60sfFQ2xdtJZ/yrGmscOelyjdQvB88CHc9 Y7Q+TwpclJw2Ha79VsgxVnex9kSDpUm3do6okRKsLKs0ERDh1kug== Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2168.outbound.protection.outlook.com [104.47.57.168]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkpp46tgq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 05:44:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QyRZHANeelVZseH8bA4Np+wRM0fbGYOM4Jyd+C0cRqUDenfwya09wqMEpJ0dMQSs/mddCCt+5vacxLKu2BGGdpFxEu/fiAHGBcQVww0TjzIiSUIgHJl/6EmWpSKUq5HYyQtunczUpufEOzc4Glr/u4DWkWsQWeIIkAsGO5ZfKsapKjnY5j7CVLRaQm3o9boHusAkxHQf0+NpCyMe9WUtcAuogOearcoL+yoKRUgxMkTxnA+y12LGag7usnnO2yRJAd75sOII+LCPvEq3146l6RBTGeNshxkPEpEOoE4Vd4QS9DRPWWvLDMcvyLyG1TQ5p4oPudK8lqRa1/Aq1AUNGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=tLe/Fh3IldcIiKhktiMhWzvgUMWF5t7FgVBKQCidzDs=; b=cbX5b+EGIMk9Ndcx2Yk8BP2AFfawpg2bc2vMN0YL4dHb+JZQR6N3fwABhw+qKi+Zf8qmGcRgJwbxsohO2JqLx0jfjsc8gfjFL8XdbLwLHhlz8fjEKmsHDsfR+HrcxJOH2P2QwuslvPe6poD6lPzJzOJHYVxDiwMkQ92iL206qhKXFREQq7vgqJRY7Zw/vmd0R1g88YiRIA9/3AlfRk9p1dtQeQ8ig91J5mmtlVI/3DuBUs+1HsCNe3bb0ojlD1EgItQ2+wjnZwusgbqcfrc0lIw0I4qOzb30HlT5k10Fypw5OMdxPj+IeDMnYHYJQIBblxHvHQ8jEooriMKAE/a2eg== 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 SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by SA1PR11MB8279.namprd11.prod.outlook.com (2603:10b6:806:25c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 13:44:15 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 13:44:15 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH 1/5] rust: Fetch cargo from rust-snapshot dir. Date: Fri, 19 Jan 2024 05:43:48 -0800 Message-ID: <20240119134352.3163178-1-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 X-ClientProxiedBy: CYZPR14CA0008.namprd14.prod.outlook.com (2603:10b6:930:8f::26) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|SA1PR11MB8279:EE_ X-MS-Office365-Filtering-Correlation-Id: 4935adb3-4d92-49cb-cf7d-08dc18f4ba14 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7hj7H8x44QwS40wTJNxk5m3zPw1g3On+HdewSRDKWuyfqJLny1xIvQNngeF4miA2eUJ+fNrqtHDSLXE8GYKfKOsNAYXy0xBtknVxfKZ1XJlUSuqm4sbH1wSSKaY/7Hm6G7b6OqOEZiQT5k4lxu2P8KZzBuS7mOGN2GiSg7S3kOqUc3BH+QxWvihK9+Zgo5k3zhTIfNie+3tyOG+/C29vNIR/j0V+t6GDF1+1nAMOA7Y/Oh/HIpG5TawOZq3cj3ksKUooCCZfDVmITrDeDS1T6QzucGrdsur920gcZi2j9XnG3AYJcsR/qppKQHnviN3KygMlt7PT+J2M8PPM3hhngvBHIKbw/jFgqgpcm+M2KzMO48g/Hm8CAURFgtskDwvWT59tPl5dCzrnKTwSEjGx0h5qfEAGo5MPyu4k8tC8ooJi0JMoo2nV82hEK6BCJOJBga4zFlirvOfN7//Av4rXcXwbKBz189zSHoZUDVN8kD55zYjUgplYJ2AL1Y5VtdZfa/0R/1qjQG6/bNDqstZqpSbC1NNXkJSIPiVqeWBOQZyqmxzG3Ftc89WyA0jFayPzhRrU0prWtISkh3mZoHEOm0gYprjvWesA8A/jN9ZjAkggUQ2JJEhcV5nW5Ns/p3yqGS4NS0tVnvFHCMk8bxhFZA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39850400004)(136003)(366004)(346002)(376002)(396003)(230173577357003)(230273577357003)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(38100700002)(966005)(66476007)(66946007)(66556008)(6506007)(6486002)(316002)(6916009)(83380400001)(1076003)(2906002)(478600001)(26005)(8936002)(4326008)(86362001)(52116002)(6512007)(5660300002)(9686003)(107886003)(8676002)(2616005)(6666004)(41300700001)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8ue/qs7VFf3iEfZMBfHz9glE0oYRyG0rGi0yHBARqxe/tVQUEMNeawpxbQ6Y6XYzkg2cHP+dZ3CnieWc3zdEOB76RgLec7DqQxZ7jIJ/asjqF42xocBpSXtgyu1YdtuRka2P15pIHy+OjFwQno7XIYaSPnUVe/QSMK7VsWd0JdsUmw0ptg0gH3muPyB4Qb7QrMGOhBXwMQrUKmYXSn9PfC8UolnWNs7AILEDiF+gZjDc/Qc6WlbWpUGceGd7O85CdT5HeN81w9LFHEs0FeGu+9QUz2dWrW8lNToloMdVVA4i6Pl4ckqdTqb4eTBjcYuli4r+nxY/N3Pcm7bpY9Vuh9+z6NjkNxAUMrcZtGMpCkW40NMuIQHtJ1Ufmukaoemr32ahp2jJ9qc2Olj4mYIPwSn9ZyClm4do8YvzPIvAxESBaFcnLlSQVOGkPF3OdnzQeFf9C1lk5Cz1iEH/V/2Mdpg7qguSoHQB4rqe1dT3kL3yQqDI7z7fao4DoKzwLxujPN214BddFwt2a1TM0dl2AWqTQ0529uDsTa3gGw0vX4Vnq3vgPhUNDFsv0t5qiEXGvxJBwnJY2SMSzbyQOu8bFCyQbWPMuPb9r1j21ZiacVGMIxHM8SCrAvyS/q4DH3+D58YDx8+n1DHuvHZp4/s1lty0s3o37PHO0fX1lQA9vWcSMZ9NRaR9b8APaksHON+axKY6AlnoAdn0hIOVsxW4yMSGHXtyHTf9hwtdAyjLXs40Ln7H/0n8cMdcKBqe/PA2nK9+2XBi/DU7SnC+zbXlJE13Kj1RsPjuhFfWdVv/rz23MWEuQ6jpDesj6uJJKx8ho+8zANv92oOYVcoBD06FxxaTxZZ0MbsdkkCHeftX7To4RxntoHXzpV3M/oFs5QlytFyDlDByU/PG4mzgHud3aLxVNOu4gutnjzmzfQR9JX8u6YdCRBRukoMAUJoJdN2gXPemMnzC0LFO1jC0bn8LJphSwbAzsE1HVto2Q7hDuGnOohA7I67nyUPDf/0/dXjCWKK5yQULxD0bva40isjItYlJAOiW2S2MTSKgyNSuNu0TmTi6eyAeVTsHhwIlkkkR5+gSpZdCkVyUqDd0jLwnnlQIzqRe48oPKU5+nwvWCJKFuN3bXWjlOdmKI+9s4lDGwvPWMRoxXxYQhwIK2a97glX1TLsJ2E+APnRMLrmiUx2Ffiv5dfU4bOsG6wolg1NlS/K8X3MJ/fAqgGi1aTO/qEeGD9bYU3bM/O5z5Ihsq1MOrfqiXJSc3uw5ZtImg7qVMpo616cl/ocMY7kGK8kuZ942OARhyexUIMZ1PhlEd0yJSjrSDdWTgPB7BYQduK65wh3e0/BTINb/8eq7btirmC3QsPdR24EDUtEkvPr+Wq1u8ka1Uug1cWWejQYKODpO3pDd7NklBlhrgILP7RWE57WpKdTHzFOLIDD2/+MbYreeix4or3H5VPEvmssun/i4h4en1s8yF8+3uVMu/Kycn0I2SgDewSneVB2TcRXRaPdrOcgJQ2WHWqDKUu9JhS+KSmjWSf5omUYaXjmZUHFkoZ3HlbmF5Du+8C0ne/BpVyYfivruZcK7baINQX+8snGeI8Yt2legm41IZkTlGG2aLg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4935adb3-4d92-49cb-cf7d-08dc18f4ba14 X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 13:44:15.4273 (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: ZLvE0y7f9pd+S6lBWx1AcqgMqM1XxBWy9dNOlcOFx+Z1K8FVbJ5HAvOzeANqg/kham67pnAU1gnmAvI35izktqLNWwFKom5RhKl4BnPJtUw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8279 X-Proofpoint-GUID: -vtxNfYZGaFyYgnFj1Bajq6Kp8iSrLwY X-Proofpoint-ORIG-GUID: -vtxNfYZGaFyYgnFj1Bajq6Kp8iSrLwY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=670 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190072 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, 19 Jan 2024 13:44:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194044 From: Yash Shinde Fixes: Exception: no cargo executable found at `${B}/rustc-1.74.1-src/build/x86_64-unknown-linux-gnu/stage0/bin/cargo` Fix the cargo binary path error on oe-selftest and path set to rust-snapshot dir. Patch sent to upstream- https://github.com/rust-lang/rust/pull/120125 Signed-off-by: Yash Shinde --- .../rust/files/cargo-path.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/cargo-path.patch diff --git a/meta/recipes-devtools/rust/files/cargo-path.patch b/meta/recipes-devtools/rust/files/cargo-path.patch new file mode 100644 index 0000000000..547df353d2 --- /dev/null +++ b/meta/recipes-devtools/rust/files/cargo-path.patch @@ -0,0 +1,37 @@ +Fix the cargo binary path error and ensure that it is fetched +during rustc bootstrap in rust oe-selftest. + +====================================================================== +ERROR: test_cargoflags (bootstrap_test.BuildBootstrap) +---------------------------------------------------------------------- +Traceback (most recent call last): + File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py", line 157, in test_cargoflags + args, _ = self.build_args(env={"CARGOFLAGS": "--timings"}) + File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap_test.py", line 154, in build_args + return build.build_bootstrap_cmd(env), env + File "/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/src/bootstrap/bootstrap.py", line 960, in build_bootstrap_cmd + raise Exception("no cargo executable found at `{}`".format( +Exception: no cargo executable found at `/home/build-st/tmp/work/cortexa57-poky-linux/rust/1.74.1/rustc-1.74.1-src/build/x86_64-unknown-linux-gnu/stage0/bin/cargo` + +Upstream-Status: Submitted [https://github.com/rust-lang/rust/pull/120125] + +Signed-off-by: Yash Shinde +--- +diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -954,9 +954,11 @@ + if deny_warnings: + env["RUSTFLAGS"] += " -Dwarnings" + +- env["PATH"] = os.path.join(self.bin_root(), "bin") + \ +- os.pathsep + env["PATH"] +- if not os.path.isfile(self.cargo()): ++ cargo_bin_path = os.path.join(self.bin_root(), "bin", "cargo") ++ if not os.path.isfile(cargo_bin_path): ++ cargo_bin_path = os.getenv("RUST_TARGET_PATH") + "rust-snapshot/bin/cargo" ++ env["PATH"] = os.path.dirname(cargo_bin_path) + os.pathsep + env["PATH"] ++ else: + raise Exception("no cargo executable found at `{}`".format( + self.cargo())) + args = [self.cargo(), "build", "--manifest-path", From patchwork Fri Jan 19 13:43:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38061 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 7034FC47DB7 for ; Fri, 19 Jan 2024 13:44:37 +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.22318.1705671870415240952 for ; Fri, 19 Jan 2024 05:44:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=orz+Ahhz; 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=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JC7a1k002500 for ; Fri, 19 Jan 2024 13:44:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=8QPeR3eyFpU+9miBZ4jFJVxfyTGv8IA0sugOCRwMwSc=; b= orz+AhhzY3Lg4xU0Nz4lCYpV1XuEro8y6ts/OrMBDfRxSK81LS5FSJytuX9cQsrQ ri6lT0REYlHU2XNgyS/Yh9x0NXah2NLAbrFf+3TJcIBuaqlpzGLHm5vFRAFo+LX8 ODJ0S45noLGF0hFipZ4PJiWEqUH8ADZ9E60/xu19IswVCGFCovStnZYRRyQ9qp4e MqsLUM+x88WCW+63qR+Il86br/hXPAWsCvvVzn9B1XPtiU/yGXS3diF2e2fUX83q PpQdB37uEjUeeuGvKykIXjxNzVtwo4W2OwlPsynKkIVs8AVLPaZyWip5Yc8c5l/h 9mIaqkKDAeVSFfNKGsHe4w== Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkfqxf3b6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 13:44:29 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b2kc0GhGzbVuiIeKUyEYD3ueJDdXbX3Pf0Y0rYyv6rK77Itmf38g3jyB/mpjmZu0K9g3WlvuNx+CGbbcQ2mroDk/prp+RYDcuvAcYW2OKC4+lcI8fOOdQYL2B3H7TAXiV4hWRivKPmp2M8lOXMI2CNNmiMh7OgTCVtiDX38NWrfoZam5watuP9Ipaie+9lvlwyN277/ZzCLdtMg0Zt5IolkoTy/rfiU12BU2z/V62q38qr6AXT8vFPioFUjWOicmV8wUv9TJiCszhS1qqY4wCBU7mYmrb5FA8p1npQm4Rg+e4xCLF4vrm24JjHxX9ra5Ar2mHO6QtCgvGl/e9qsmBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=8QPeR3eyFpU+9miBZ4jFJVxfyTGv8IA0sugOCRwMwSc=; b=J9XvExD9HPeZU2ZhxbqEgx5d/GaoCiytvPrEeojET0GoUp/0XOZv6Wl36aKTv2IE9IRQZNky4Za445eL7idlwenpaxdKNsUTBEJVxprtyOy62S/ZtkPWIwS7c2Gqe/BILdu3Zn1XfR8EpQIw5GUb3B/3crUQzUHROgHZnd6+uFz88DbHhrsQBu7RozQ1EZJhNIYr0SrfoyoBZDlcU84r0JDcvWFNcgrDD+w4z1MHm1YFbtGnpD4nCZRzCajc51APl9ullP54TOspMhKGE5GrpJtpVx68a2VifVrsG/zBVLuTe1U+f3qCcT5hkdfjnlXHYkesqSS+76uM8HpcidnWzA== 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 SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by SA1PR11MB8279.namprd11.prod.outlook.com (2603:10b6:806:25c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 13:44:27 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 13:44:26 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH 2/5] rust: detect user-specified custom targets in compiletest Date: Fri, 19 Jan 2024 05:43:49 -0800 Message-ID: <20240119134352.3163178-2-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119134352.3163178-1-Yash.Shinde@windriver.com> References: <20240119134352.3163178-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: CYZPR14CA0008.namprd14.prod.outlook.com (2603:10b6:930:8f::26) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|SA1PR11MB8279:EE_ X-MS-Office365-Filtering-Correlation-Id: a0e659ae-6faa-4d3f-be37-08dc18f4c0df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4D7pDjSdBqiYWe063BXpUpio+5LpMIkx9HW2DhgLPaSyFShiMbyJfeEcTAWnbuTfTBpgsw1ngfjwSD82JEVdpnZnrTpTPyzJ5pW/TZQ5Kve75iWDuy4vWMsTPSichr8NU1TJJUqB5b6WAlV87PW4sbOLTPMYbpM7dp4RGWYaBM6+Rf+hz+THsR1I19CQPmujDG26RYsYedbfutxnYmCCSoRsVAdFl1srqKDtY6sJ6yMOIy9dQImM/swObSUdkj6NnWmk/ow3Cr1BX30R78W9b1YEJg5fhyOwhb3wtqUnhHr548qH8H+gD5xWtkVdY4NX0CtVe9u3e+Bc1l14q6EtCigEhGQ4e5o+R5EMTr+jZ/O6VkNgNltDK6xRU9R0m3QrTXLidqLq858WF/9dh9z3QctvRnhjVq+0JyvfjA6RTu8DTE8IMofOSPPBwtNE8NrIne+km5o4C0gQdWVZ4aK8op4UPFRJDh9eXgGlpP4OvoiEvzm9sHq1o1YdLYyxfCsK1xdm7B/q1byGa4Sk9DOaSHWW4MXZoqAyyKVmC34w98rT0GhJNZlcTy8EjLZzN3EVxIfPP3FX4VnVPnQsUfvPUDmcYajB+BUgQ/EzDDLmOV0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39850400004)(136003)(366004)(346002)(376002)(396003)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(38100700002)(66476007)(66946007)(66556008)(6506007)(6486002)(316002)(6916009)(83380400001)(1076003)(2906002)(478600001)(26005)(8936002)(4326008)(86362001)(52116002)(6512007)(5660300002)(9686003)(107886003)(8676002)(2616005)(6666004)(41300700001)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Njr07mi7cO89xHlxcUVNrUf/P2AabRg0qCEDcAvz4T7DtdpgxyYY7MWdzo4kb7W9GQuWR8giI8jHa2O1GC3ZVVYnWmZJUgI/BW+n9poulbe+c54hS2MD9kkceOKPj0hpltPs7s/Gazl5LCb2p8MUCi0Z+wD2TddMH8bjZVMR8hvnT1V954GVKzeiWsAA1uLI38C97xTfKJqk6z3/227X9UH+aW1exSXRYZFgJ+LQ2pAGUp42t8cDO5fwnZIAZKihg9ugC1+CId+CGlckt3iv0sX5V6/XcQDDCYuVZhEIr2uUC6mseq583iOsqUJkw5HQxu6ZnA4hfm3AoSiRJXmNPM+g+sb0x61D+1dw8Sdya/wy4hxyZNOfZNU1X+Fq6x2WGEelrFfHJ70PIO64OOBMbWkAOw7hlem7u1qEj16Wvxe2Jif6J6wryY+ZD0JJZClgDXxqBbVmCy5VsNyiARnZuHyTagwvSF3GLzsvKVDu7YejTOSdCzVTcMdMc+d0SKWZz+kKq03C+xmib45zePSUWfOtGhKFtcjP4hboB+23NFt1yWSK2O4rX1zfaeNvDKOyZwxkd+YyCn3A4wfSkr4XFs2Q1n4NILDl8HKkmTVA4ZCcGFIwLwyQcz430i4XusYiUpJgpX/7UaGLPnPD9rnam/fnn3P/ZpOhIyPUAJiRiJUhGtg97IPwir8Tej7outLSnQgkcg93gfy7VO8BjdBVQ8HEeYsp+NaKzpKB3KqgFaVF28SMhvezQKhtXPU0mtrFmsCvj34/07PNl4NQYb15cuzx1IpbyK/dkevWsc2kzFeSweY3J0+R+ym8wZuAe+vN+kK4xdvGELqF8Ork5zX83AITmw8MTrFVU5LVhIc824spsVAHt0v8aL/pTuszcP9Rcdof8n50c0RSylbU2shxBX1g8YuN1PjGlxS4kYqIKrm8O4CWR9312C8bKh5it8a8yfD+MN3PeE+VTWruP6N6FpCfZVvQWOHJ9rsdwcjKScg/GdDUpdvCgwVqrfVkbAmkucMl74IuBCRx//K8LgEZ2PQbfm+kqqj3Q6xAgzrRHgY20synCeOYPueGUqywQ2u3pUtAp9zOxuDhOL4ocuqs3B+ZqLgGdWsBRcDqTaqtIm6HgOQKspQGAMFntJxtGmWR0iVNuf1kzntMoekXzxCkm2HlzKPi23GlRisAtEsmagJG+2bPoFq0pUUB31LZqU0UZoKCab4RJwgL8tAS2wKkUAaosySmHkIuDJT7rjqnyJLR3AmAQO44l9WGPoNgAwql89gSgl5Tw8TAZakvvkx/jV2D8iuXEfFMQ7qjIERauPOwmCG59TWmTKzoRAtAKj0By4Uqkx+Nxf4SVJO8awuqi/wxiACqE3NNycFtCY6X/kHZ56t894sjLGJpjpxop+oB2NceqSvvccQ6qzzD7pcxJ9UMAlInqLE44syLAXFhOkhvGjaiQlfki+cWR3e7tYYu51Gg83tracU8ZorshyPpZ1YLGYrT/27rzyE/El5TfU8YQ7mrMsfqKoKni1Fp9Ij1G6SKUaLEazglmrvHkdYMcIEfOf2JnRTr16nCZTrWdKAEZgNRb8pGJjFBktLlay3bBvv33oibygA7YwtDLWzlDQ== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0e659ae-6faa-4d3f-be37-08dc18f4c0df X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 13:44:26.8107 (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: /Y3HWygf8yTGeKhpDJIbchRD2ZvJtC26i32VHMX6lavqjBgLG2yOhm8g5svdclB4KMWljOmLeW0jubeunDSX9IwNyQmNyWkFYx3tX4gs5i4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8279 X-Proofpoint-GUID: GQ0WiDkX__iFZkzn0rQkjuf9GDPTzPYA X-Proofpoint-ORIG-GUID: GQ0WiDkX__iFZkzn0rQkjuf9GDPTzPYA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 clxscore=1015 bulkscore=0 mlxscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190071 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, 19 Jan 2024 13:44:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194046 From: Yash Shinde Fixes: thread 'main' panicked at 'failed to gather the target spec for '-unknown-linux-gnu', synthetic_targets.rs:66:9 Detect and fetch custom target configurations when rustc is bootstrapped in rust oe-selftest. Signed-off-by: Yash Shinde --- .../rust/files/custom-target-cfg.patch | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/custom-target-cfg.patch diff --git a/meta/recipes-devtools/rust/files/custom-target-cfg.patch b/meta/recipes-devtools/rust/files/custom-target-cfg.patch new file mode 100644 index 0000000000..15a7f252cc --- /dev/null +++ b/meta/recipes-devtools/rust/files/custom-target-cfg.patch @@ -0,0 +1,90 @@ +Detect and fetch custom target configurations when rustc is +bootstrapped in rust oe-selftest. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/119619/commits/26c71cbcf1a9bce6ceb962d753c467d098f63cf6] + +Signed-off-by: onur-ozkan +Signed-off-by: Yash Shinde +--- +diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs +index e85f6319936..c45c0b3c652 100644 +--- a/src/tools/compiletest/src/common.rs ++++ b/src/tools/compiletest/src/common.rs +@@ -479,6 +479,7 @@ fn new(config: &Config) -> TargetCfgs { + let mut targets: HashMap = serde_json::from_str(&rustc_output( + config, + &["--print=all-target-specs-json", "-Zunstable-options"], ++ Default::default(), + )) + .unwrap(); + +@@ -491,16 +492,33 @@ fn new(config: &Config) -> TargetCfgs { + let mut all_families = HashSet::new(); + let mut all_pointer_widths = HashSet::new(); + +- // Handle custom target specs, which are not included in `--print=all-target-specs-json`. +- if config.target.ends_with(".json") { +- targets.insert( +- config.target.clone(), +- serde_json::from_str(&rustc_output( +- config, +- &["--print=target-spec-json", "-Zunstable-options", "--target", &config.target], +- )) +- .unwrap(), +- ); ++ // If current target is not included in the `--print=all-target-specs-json` output, ++ // we check whether it is a custom target from the user or a synthetic target from bootstrap. ++ if !targets.contains_key(&config.target) { ++ let mut envs: HashMap = HashMap::new(); ++ ++ if let Ok(t) = std::env::var("RUST_TARGET_PATH") { ++ envs.insert("RUST_TARGET_PATH".into(), t); ++ } ++ ++ // This returns false only when the target is neither a synthetic target ++ // nor a custom target from the user, indicating it is most likely invalid. ++ if config.target.ends_with(".json") || !envs.is_empty() { ++ targets.insert( ++ config.target.clone(), ++ serde_json::from_str(&rustc_output( ++ config, ++ &[ ++ "--print=target-spec-json", ++ "-Zunstable-options", ++ "--target", ++ &config.target, ++ ], ++ envs, ++ )) ++ .unwrap(), ++ ); ++ } + } + + for (target, cfg) in targets.iter() { +@@ -545,7 +563,9 @@ fn get_current_target_config( + // code below extracts them from `--print=cfg`: make sure to only override fields that can + // actually be changed with `-C` flags. + for config in +- rustc_output(config, &["--print=cfg", "--target", &config.target]).trim().lines() ++ rustc_output(config, &["--print=cfg", "--target", &config.target], Default::default()) ++ .trim() ++ .lines() + { + let (name, value) = config + .split_once("=\"") +@@ -624,11 +644,12 @@ pub enum Endian { + Big, + } + +-fn rustc_output(config: &Config, args: &[&str]) -> String { ++fn rustc_output(config: &Config, args: &[&str], envs: HashMap) -> String { + let mut command = Command::new(&config.rustc_path); + add_dylib_path(&mut command, iter::once(&config.compile_lib_path)); + command.args(&config.target_rustcflags).args(args); + command.env("RUSTC_BOOTSTRAP", "1"); ++ command.envs(envs); + + let output = match command.output() { + Ok(output) => output, + From patchwork Fri Jan 19 13:43:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38062 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 6FCCBC4725D for ; Fri, 19 Jan 2024 13:44:47 +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.22326.1705671878585065592 for ; Fri, 19 Jan 2024 05:44:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=HwtDvrg2; 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=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40J6vjxJ024637 for ; Fri, 19 Jan 2024 13:44:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=3/tKLyUcn8JYi4nU6KRjMEGi7TGeggur/PfByqa357w=; b= HwtDvrg2HgwHvI/n6qYokU0r3wsV5eyI2TpX+I4RTgWUH5BBdn8si+atKDMcpnZj IWYYzyVBJJVYJyKOq2zLtaWNwlKMD03jcanwMJChGTBHH0hugpAWOXQGPP7Nz6MD wt9rA1QKqhoivdDPY/N5odleUkoCblpf2iK3RcDdLDUoT0hBlL+Wn+xTP6wUrntr +P+ldNn+nCt34IldgXXcutJZeqU+HzZv2Il/gKXDGY826h5E6W0GwW9Pg1Hu/rWs jxlcLEbt8HZ4yhc4D8akoKIZ9iO5tmZQtaZPzeaQfDgoM5mKjhelQiT4Jej34ce1 1cPkBrXOsv4pg3NONcpFSA== Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkhg671h5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 13:44:37 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TMjbbrZUCleIhTjDqeme2dWtYSXlbjDY6NjhT/HmGKbSXxgMxH2+vA9UlikIqlb7uNOFkhtEYeoW5W8OVHQJ7X9a2IOdzykr4ey8NeKzr5ZQe3qiLtSWj7zfQHAI/1cvL+rGvsygtfQR1TbKvUnG1A/ZJKGxorJ7E/30gWiMNtT7KMrRY9QnrCT4aWFxb5jHLTZR6Lj1B8hiWMfiZ4jvEOeDWQrMtzTZAg1uaG/gKiTst7oemv9Cpqg1BBunBrS5PDWkIJoxretNEaTaUzeTHOIiinX4Yo1EvbG7jKkPtApk/hCulyhEv2r9hOcg4SFbapMKRxJOw+s9NyMVB+Kl5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=3/tKLyUcn8JYi4nU6KRjMEGi7TGeggur/PfByqa357w=; b=KR+BIvob0WwQbFRbOgC2nzahREz+HZ5XqZ6DLfPYiTevb50SoJdZje91cxg1rd8j+EwdrYJipIkkxej9RPGnlggxooVQ+O8SJKwI/NOprJmmLVMkJwnUqV1VQiQ3TWK6h9eOco6faB1fWsX5pSQ1ElBZBeVesjeaI7MsXQuRXcSmw4Dgig/x2/fuZ+XMhgbfjEt5YLSJ0XhXvXlywKs4tc4vT/4Z8L7fT+dXhhOnDyQ/eYJG7uCYJF8YnUlzwQEbi72t0eCQzY8nB9EXdO/sHN//ZaLfCeDVNiWQE2kIiT4PGrtWsRZH1bdyYBtLq61wC4bgoQuVWcKQQCE+7Zo4Dg== 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 SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by SA1PR11MB8279.namprd11.prod.outlook.com (2603:10b6:806:25c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 13:44:32 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 13:44:32 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH 3/5] rust: Enable RUSTC_BOOTSTRAP to use nightly features during rust oe-selftest. Date: Fri, 19 Jan 2024 05:43:50 -0800 Message-ID: <20240119134352.3163178-3-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119134352.3163178-1-Yash.Shinde@windriver.com> References: <20240119134352.3163178-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: CYZPR14CA0008.namprd14.prod.outlook.com (2603:10b6:930:8f::26) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|SA1PR11MB8279:EE_ X-MS-Office365-Filtering-Correlation-Id: c4670555-6558-4c41-47f9-08dc18f4c3f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y+jXUGZQeKIPUEvEslw797MgkBKd3EfSrjp8xdUIGp6DfS8aEzqxRzGom55h51cCh2KLHiH6htYz9UC0BhfG6EnstYYG35tycytopaY8craDsNOJ+eyi89/3p1oTJdhOGLOemtmCKtaMfI1wxtolzZnIjzIuQnKdAreR51svu3Y9QL9wQABbdzrvHFngNIgmrzgs5a+tyAqq4B/JC7H1Yg6mBBS9DbgVfTpf84pxqsb9+LhfvNwydndOojled2910ZjOs1DAfMq5pxh1eex8esIU3QQcpEbttWM84+ZWx3fPuKQFdE85pHUccfv1iJye1RjkwJTUc9ErLKy8ZQQur8TsOTh65X2DQUYjIh2lU8wUtpY7UQICaSngEmZI6i/rBQjrLR9TLoN2EUoe59GRbJQzUQiq1asI7xIwh4ZWjTKsFBR84pemqZPTrqAVaKNXZAniODsUNMZ1Jfkfv54HYW4mO5z5Ftr0gwcC8iv3jms2Agk4yO4h/usDxhu0dFk2N1eInoI0qAnzF4k29fY8B7MXT0Pn+TPqrAEwrpHN2LTyhuUKJb5umiMb25awjk3fBHxiVO5ZJtZzc2utobumS4jX0XQ+x1Srgf2//w5rEak= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39850400004)(136003)(366004)(346002)(376002)(396003)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(38100700002)(66476007)(66946007)(66556008)(6506007)(6486002)(316002)(6916009)(1076003)(2906002)(478600001)(26005)(8936002)(4326008)(86362001)(52116002)(6512007)(5660300002)(9686003)(107886003)(8676002)(2616005)(6666004)(41300700001)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c1Esx79XUhEkkYCZpiy8XkeeXbLrfbXldMvWjGn7sMqr2244nBR6J0r+uo3JskPcBNyz4c95smqua4sd6MNl2SbjCZPQvEw4udjjvtz7Q7IYmBT3lO0sGPWmUzmQBx0JqMU8KWcajAyQDnCIvYFs7TVggjwgLSo6bV+scCHK/pAI6y/67BUzkdWyffgXEk7n2zYEyOxYx1HcfLb1oaLa42lrJl5ZNoGidIGTtPPL70eGPJV5N5OKRN3zslOGBELKoTgcjxibcdv4pvAYvI0w2MoAHwnhxPEodYyaaXDfL+yR+qMIjCmkrA6HEyj02kDp706Fdh3ZauyBCpgaYaRgwJqFXulSr18pBySdhe+mU2YjudbAVpBYsWYr3La044JmTilWEGW0JTWuMW64bCcCufa8W2TpG3dpD1d+Z9jHJ+t4BN/obv58HKA0pcU2GK5vOC9Ty3DYd23mA3L4hS5RrXUg6FRnPXHnI2UtIQXVQ08dPHauKvTO1ASmqb1/BgGgYJuvepEBbUCsTr0KBgbzCD8JwQgnqZcdM4VoiI2qOBcmnu55BFqN/d1sCOXai/eZTvDx5djd/B/U5GMyZekFJ2Qzx22TnLhXUlFVzpgGdXijl8nZzNhc7bdDb850Swu09bDiSWz1SaCT/gpajBRPfoHP2DosyJ/BMzZZfNt3QT3teAngqm58q4O8odxphp8vYYeEVPiP4/THWrqaJGQI59QbGi4O9CoM1ZZ2wRWjgdJgJ3bF9pKabF81hcHahLRyCTXPCaaIqaJHGBzuQg42Tj7Ag66Pz9JSQqL1qs9VQXfyrHTsyMA9g/1prF/C9SqwmLTzI7HIrp/l3APAzUx4jKTqnz7JxgREjOgy3+lxbBV0bspDBZeKnhNdhSiwFHJTUlQ32iW7icd0y5jhjsF5E5kcnb2PkD/OROBtT7ghprUrvA9XKOxa6vRD8yv5tDpDRtq6hMDQikyeqtmx3AqfheyF0TKJSTYS3TOLITvhiwuiJ5Dj4oANGpwh7BlrmPdWyYc4jxxRAYFVUXjs6odPdtLeAjd1kBkayCxlHw+Kei4v0NbRj3C/esH9JKG9KJf4VQxqzFdiETiH2RjgSSGFmpfmb8b0gwgQbjKrM1CkTy0UNJByIB/CqspG7xKFavSa1lLz9/Hj+quZf+PkD5Fyj0kwWJzyrH70v8GyGtXm3EvJ5DdB3dyPpWaOnNIFb1kQcU9Ix1Gq8cJP62tAxe1LM+JeMjfEDDCs4MBWJoG08DV7J+AS/3bVXmJJLLedU/Cyctyv3iFLBq4YILD6ete9A6Vnmc6erUXj1PpRPk7cQ/QhQSdJLsG0nEDp5zu2IcAARxzauARpaLpzHRBgUyky/jSgiFZH2QDF7kF4cn2wWcq2cgDqBXGHWgc/MoG9IducHaX9EdUdob+x80a0tc14R36pDHdrdJKGlJmccpOptFEUwlLLhdxPZF5SfLwo1bn3/LGz8QulrPkHOe7uF26gj9ZBwdDbkeappqvg4XO22PPCBkubikNM0vF3AjwbfSMWA9v2abTOazlHA9ArZbBYAra8U5lKH1C5TzYL4WUR6NQRvhunmZoMwIeJeehPFX0DuYyEomJRu6Cn9JnLdekzeg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4670555-6558-4c41-47f9-08dc18f4c3f1 X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 13:44:31.9562 (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: Tk/ZAIGWFpSgmGeT9Pt6QRVk8m331Sn+ugMR8aCEbp7qh897+tiwJ55YMhBLyMqCBJYqboUkXBX10yjiCHgVvWE4SvNC1cgpYycKjsNJCs0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8279 X-Proofpoint-ORIG-GUID: bAuT-tuxpJ410RTDacLtwrohIj7DpCWn X-Proofpoint-GUID: bAuT-tuxpJ410RTDacLtwrohIj7DpCWn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 mlxlogscore=999 suspectscore=0 bulkscore=0 malwarescore=0 adultscore=0 clxscore=1015 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190072 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, 19 Jan 2024 13:44:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194047 From: Yash Shinde Fixes: error: the option `Z` is only accepted on the nightly compiler When rust.channel is set to either beta or stable, we can't use nightly features on bootstrap without RUSTC_BOOTSTRAP. Set RUSTC_BOOTSTRAP=1 to use nightly features on stable or beta. Signed-off-by: Yash Shinde --- .../rust/files/rustc-bootstrap.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/rustc-bootstrap.patch diff --git a/meta/recipes-devtools/rust/files/rustc-bootstrap.patch b/meta/recipes-devtools/rust/files/rustc-bootstrap.patch new file mode 100644 index 0000000000..406fc610bb --- /dev/null +++ b/meta/recipes-devtools/rust/files/rustc-bootstrap.patch @@ -0,0 +1,21 @@ +When rust.channel is set to either beta or stable, we can't use +nightly features on bootstrap without RUSTC_BOOTSTRAP. Set RUSTC_BOOTSTRAP=1 +to use nightly features on stable or beta. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/119619/commits/8aa7dd06f6e50621dc10f9f9490681be8a45876f] + +Signed-off-by: onur-ozkan +Signed-off-by: Yash Shinde +--- +diff --git a/src/bootstrap/synthetic_targets.rs b/ src/bootstrap/synthetic_targets.rs +index d2c65b740da..45baf56f46b 100644 +--- a/src/bootstrap/synthetic_targets.rs ++++ b/src/bootstrap/synthetic_targets.rs +@@ -59,6 +59,7 @@ fn create_synthetic_target( + let mut cmd = Command::new(builder.rustc(compiler)); + cmd.arg("--target").arg(base.rustc_target_arg()); + cmd.args(["-Zunstable-options", "--print", "target-spec-json"]); ++ cmd.env("RUSTC_BOOTSTRAP", "1"); + cmd.stdout(Stdio::piped()); + + let output = cmd.spawn().unwrap().wait_with_output().unwrap(); From patchwork Fri Jan 19 13:43:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38063 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 75EEDC47DAF for ; Fri, 19 Jan 2024 13:44:47 +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.22327.1705671881160226809 for ; Fri, 19 Jan 2024 05:44:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=S83Kcu18; 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=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JDBUFq012496 for ; Fri, 19 Jan 2024 13:44:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=bLFUQGg0HZ4ptAyzqEcWSrR2yXDsaUkUtlPQ+KhZ95U=; b= S83Kcu18rjICjJTdVcE4Qna3fJbcxNyd9XGhgaNrIWNX9u5Yq2dPaThyq7IhXAou k8+ob05GOOOQnn9LxLjKVnCWPqk3UpWXUPF+8gk2PaOdWSOidtekrHLdzx2pBXzX BM2Bqt4lVYRNe9doibwtBGi+sEl7GuitATTkFblcPdkW1fF0T5SKGawjodW8a2Ut xH4YtzSQKQ4K/6u/aeFd5e9TgAwQhP65roZPh8AbyYuAHEiyxxQ6r0aOw87h4hFC yGRORcPmBrpKhIxOuYOE45T+tRpxsVuTMy8lrCss1x0qm1VcoFzHRrxjHoKCR/iS wE1S2Ik5jatgVH1XLjMT3Q== Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkfqxf3bs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 13:44:40 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AJc3poukMpQc3yCDa1DIDPLEAp383Tc1MZEpEEuqF4bi/MkLDAQGmBfB5xFkPIn4ThbSPisrG/lQGhbYR1fEdTW/SMgl50RGuIiF6MbK4XEFccP4RNHA1FTq3Muo8JBXixvfRDJV+Ja5pef6/IsLe56YIQdsnorc4r/HDOpOYLItuxO3wdsy2oLE8asLSbwyO9g4NGRwxB9m6BYmeV1u+4ubFqSO48HegtCBIuD5GeX/w6BXpWWUJADjAa5eF52Xo67k9Q67YdT68GxIk8mpzG98Zm3+HClPQaOE+EuBp3rwOZKjfpB7cxB+4ndZ1MTlPTDefc52LQtyCCPALjlScw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=bLFUQGg0HZ4ptAyzqEcWSrR2yXDsaUkUtlPQ+KhZ95U=; b=UCIVRCWMJMpMSnexaA6Cix3N0/4fo4MTnjxA9AylacF7tbeWAM8bVJayAZ1Vq53AoaDgA2FPAlMpNARLlHyPLUXSkqEVwqbnetDICxsiwqL4DGXjr6rxlarZNNNy0w1v8t0loQSRVHxVoYekCNzvNRJccGPo25/+Gfqr1TJhpImYXMeN9RP2+LgPUH22ycYKUXvJ/Qz7rhWoyvP/EJsHoYAc8T982dxztgaEuIrTh1lkpR2oe7LI0hBWtF6BREMvyEJ3XEN1Bd45UPIEAuvU9+rBqAQbRkp0ZV2QoB9dZAGD7xK7hsVRlOlMjTeM3+kYnUBvPRBPdOnZLV4x0/rArQ== 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 SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by MN0PR11MB6109.namprd11.prod.outlook.com (2603:10b6:208:3cf::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 13:44:36 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 13:44:35 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH 4/5] rust: Fix assertion failure error on oe-selftest Date: Fri, 19 Jan 2024 05:43:51 -0800 Message-ID: <20240119134352.3163178-4-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119134352.3163178-1-Yash.Shinde@windriver.com> References: <20240119134352.3163178-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: CYZPR14CA0008.namprd14.prod.outlook.com (2603:10b6:930:8f::26) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|MN0PR11MB6109:EE_ X-MS-Office365-Filtering-Correlation-Id: 7cfe9467-84a7-4352-0dd3-08dc18f4c62a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G6rDHiD3osch3CN3INru1tCQ+ema1gCHfr/LStZpRj9Iwwzk2A0H6Q32s9yhJj7Soxr2NpIY+5FNMy7hMmwMKyy8XEkrNfkTILvT7PILXNgdxgD91TlRVKq0NCrSr1k3nKEEx0wXNv1vLFHzYC60mRy07eg9/6v9Ws7QEj1ACYcEj+sMXAVgBGdmMsPvav0yU4j0STxSbscF0F+vFIIYDFPA77u9No+4qIxVSSNTRsCTLQDoxNtH2Uu8cbQt5O2T9opHNDZQlrMNHHCHN/UmbKuWZN0EatpitrpGmmrzIdKuMOjrhnYmo40X3QwvR6hHAOmHiETEjgB/ZISNzZ7ZfOIK86bQA5ZFconIrwl/jqcyXXxy2WXBlKtvo/QBDGT28FNl/HtFSDdC+wUUm2PSfYPnmX53d39PKgV6wp28oxHVj3kdWQqVa6N/DIbUpy46CeaPAUKnuKNIfrtJb7PsXwQuvvBPTGYk9szbf/3QV2dAvP4D8LhfbkTDTfqyJkCDQh+tJxYZEF2AD3md5vk3GcPcS9unyqJ0oryHKksilrv/G7rUvrG3mi0oPQJtDGoWnKGz/htwaDcFp/ys4vzriLOvmGBkcm6GL0SzrbpAfZk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(396003)(366004)(39850400004)(136003)(376002)(230922051799003)(64100799003)(451199024)(1800799012)(186009)(9686003)(1076003)(2616005)(6506007)(107886003)(6666004)(52116002)(4326008)(6512007)(6916009)(86362001)(316002)(26005)(8936002)(8676002)(478600001)(66556008)(66476007)(6486002)(66946007)(38100700002)(41300700001)(38350700005)(36756003)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KkEK2a5mqnjCc0/MaqPOktQY2M23A9S2QzTLXIHM7fzBubPG7iN0fLuR3g9jwj4U4SbRCssBJKvkrcR08E0sUCGVtzgMcTFZfWtJQ/LV6ifFyqZHuVNwwrRrxHdDUEFz5fwUGVHI6K2GPbDgfd5CGN4U6sro1JZ98anERmyDybhtNPIpo66kZZoJl5hNXWxrMawuIyCraQkPpjnH/NLCejISK9HPnr3mTGS5m1/z/BJMF3BX1XkCNpv5YYhii3bnHISYk7hagtVL+Q8cStPG310LiVN34e4K2P2FKIZh06Ax2HzOTpZ32VV1GhCMX2QdXHblFpPUg/ryR0gNiNfK+N8KTos9RXw/HIBDRq5GEaT2AQXrHh/z4YJT6sV95LYLz30zNco2PLLeFjMVaN3IDIdBX45Yv/sFiL6jm086/gEulrjyWwrpNtWOX4vFlNl5PB3sAhWHZ7r1pEKEVKfX8dHXeIcD2SDbsLHngXWpk0bZhgOfDMUeDUP8yVzYXnfMUilCJDVk2qsPShCyyiq03vOKGqi4csUabfU92OrHUDnms534f2xAU0K86maCLtTKpo9fmPfQutI3O5UL0LXBHxLFvutdKYJoLU3d4/egg6xjOsVTmEtLW+HhJlMMP2qaeGXEr14Wu6807ygMdWe2hkVZa53VAT9s/aRsx2myVz/3PmxUSHTGMWgwK13zSA8XPixfW+ps90BIG0iCfwTZskF4So4A8e8kez+s3YIeJTlMGKGp1pYYY/OWkbWWYYrClcd6Pgmo5+YrbcSnby9g2pHEMna91QRLjzzF73ougWtIZrA6nkXEHOhVnMaPe4bQF04x155h6MkdyEDuuELik0zoPYPyxv/Fq6GmcQcPQALsre4gohqK2WBvQGxbDEtFowsCZadM+Y/M3h89ugaSRlrEqxW/cV0YhIguuEcPCgeZwDEMbr6NG9XC1aOcr+jDO8IDkFsSsux6Xwh374m2njTaiMuSoPMCYT1v77rH/dfCGU+CI7amf86IOCxmVqVsJyJ7JAw6VI1Fhp1kuOZqQnbyO/uyjfSuy85LmLz9nOvPolI9z5v4etntLu/4ZegsQ7jsK5VkWjn92mHrk2JljMnC1xz60DWBMJY0qzBfxY9RHV3OKdmJg/tTHsJK4y5JWPUUlYSGCmbWiVjQK0hbrdy3BMnL3qidtvt1IrNn2t1+8XwPvRiVZoIfDV+pgS95rg23m12hcBrgzb1jG/nZoTxivIE2JxoQ+I2CkXgsvk1sJLTCO6YGyPjEVcUO43eGzyy6ABmjfsOh1hJVuatVmGVCoQfWtKdsrw8iRhHTYDANMO63CCev/8rzJIMhb2CSzs5alVacA+rbVRgHzYGEqBo6DJNQcCFGUFWFW6GgOZ0NFr5MlKXomSHlxh2DQDBm+TIcIe0WBGbZTcTF2rIFfk1tPd4wCxNx/wtzVx2klzlxk0hl9hgZU3ycxpYWwpK+4qdhSC5YNMkN98LoqbA5CP9gI5nufbg0mpJZR30ckc7dfSs42rp5OYRav93fxCdf39p4dZkloYf9kTQnYvR4DulBsy6kAOKZkjNSq7dmO6i9VfpSAgIMDzbxAuHH0QSY4Ls5eky3GJShmipheVt0PA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cfe9467-84a7-4352-0dd3-08dc18f4c62a X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 13:44:35.6729 (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: zUEo139MsFdp2p1r70Lm5bNOgecMr18JU2Qjpzx4XL8E7+84X0nMpAgduklhSoiox72Deoe/QXnTv5onrPqpZsPBayGBtl7CYLi13AH0tF0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB6109 X-Proofpoint-GUID: trwJASeROBF0AF8psBd_5tSySEKlHInD X-Proofpoint-ORIG-GUID: trwJASeROBF0AF8psBd_5tSySEKlHInD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 mlxlogscore=820 clxscore=1015 bulkscore=0 mlxscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190071 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, 19 Jan 2024 13:44:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194048 From: Yash Shinde Fixes: thread 'main' panicked at 'assertion failed: `(left == right)` left: `x86_64-unknown-linux-gnu`, right: `x86_64-poky-linux-gnu`: Cannot obtain compiler for non-native build triple at stage 0', compile.rs:1474:13 Add correct target value for cross-compiled targets on stage1 during rust oe-selfest. Signed-off-by: Yash Shinde --- .../rust/files/target-build-value.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/target-build-value.patch diff --git a/meta/recipes-devtools/rust/files/target-build-value.patch b/meta/recipes-devtools/rust/files/target-build-value.patch new file mode 100644 index 0000000000..23e8c76801 --- /dev/null +++ b/meta/recipes-devtools/rust/files/target-build-value.patch @@ -0,0 +1,26 @@ +Add correct build value for cross-compiled targets on stage1 when +bootstapping rustc. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/119619/commits/b888e2f82b9dbe81875f50d13adbc0271a9401ff] + +Signed-off-by: onur-ozkan +Signed-off-by: Yash Shinde +--- +diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs +--- a/src/bootstrap/test.rs ++++ b/src/bootstrap/test.rs +@@ -1489,8 +1489,12 @@ + // NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the + // running compiler in stage 2 when plugins run. + let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 { +- compiler = builder.compiler(compiler.stage - 1, target); +- format!("stage{}-{}", compiler.stage + 1, target) ++ // At stage 0 (stage - 1) we are using the beta compiler. Using `self.target` can lead finding ++ // an incorrect compiler path on cross-targets, as the stage 0 beta compiler is always equal ++ // to `build.build` in the configuration. ++ let build = builder.build.build; ++ compiler = builder.compiler(compiler.stage - 1, build); ++ format!("stage{}-{}", compiler.stage + 1, build) + } else { + format!("stage{}-{}", compiler.stage, target) + }; From patchwork Fri Jan 19 13:43:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yash Shinde X-Patchwork-Id: 38064 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 71D64C47DAF for ; Fri, 19 Jan 2024 13:45:17 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.22335.1705671911271644646 for ; Fri, 19 Jan 2024 05:45:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=Uce46g3t; 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.166.238, mailfrom: prvs=174893ae64=yash.shinde@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40JDB7AH020871 for ; Fri, 19 Jan 2024 05:45:11 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=LAPD3HRSW0UiBDXV+6NgLAdJ95RX3ckqzIN/raCfbsM=; b= Uce46g3tLcsvNEp6cDAfxB6tJZt3klJ/vrj01diAdQHqNAfkkPooaNTnh/XceIUf OrfgByIVUM1kRi9kL2QEMjhqc71mTDaJtIT54yd3G8neOO2/CSaXaFoyk3159UZT 8JlGeLsi4VXc1DB41ugLyyt9Pt1CVAuEJS3bjx6+pGgCqW5J17fEk78CFjdvAyhN xS+x3mr3MVB/IULWW7ZJ/JMrWCdQK8AHdgK+s5f+O+w7LYD706L48ViQHVBSFaht 8TIQCCZIeiuGwdYKJk+wRWKxBbnshCQJ9hmublEpD/7lfSKtraRNqvKdUJ/7vm9S ZKna6XlxjT3fXbmzu5/5pw== Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3vkpp46tj4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Jan 2024 05:45:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Brpn7Zo5dGm5BRuAijLmF0lQ9CQ9Evgv2PnzVUTCn/bYi8/CwvhiGLps9dk/qFo0Sw5AxhvyaWczrRAtWSUcPG6l8U2HZes4FPwD2I3tRmPjRjYaV+7VW7/KiUOnGlhM5qyhmEAvV4V0Q0CaT9AlvHDgDZPGnoWLDau2aoUfUnXoLVm67W7Bh8OYd34Qw9QQEb72FGnx2RCSeVGI91Yx7FaiuV2zzyKhAh1EqoigYsTUQwwHQmUnljj0zg5fxKF/SC41al801IX0wa3bUjwibvJ13dhBDZDiS2lMDIa9zeG4DT1ayGIKXCfMeYJ7VerBLT2DXmbokJHXma5SdpDv2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=LAPD3HRSW0UiBDXV+6NgLAdJ95RX3ckqzIN/raCfbsM=; b=cj3YzjTmnuMNxtfOSAb5zY6eCi7avcUzjMaQCw2KaAE5MWlXAo1XbXq+8pZMZRbEJa3BseFev7oxbfJhjOQy14Tes6mmuoRcRHntTh82OFYnss1cywp+k2ea3UeMh0TwFEdVdgil8L/j13alwJ+3EdFI7beJ1q3YucB7/o4iVXnx836jH3YBKGEjfCqotJ602W5rxhJVSLApB27y7gj81kjBq3UJkMWlxMCTm8vOIARoN0MsFQUoGeV+99V8zogpGZ6KpBE8aIzk2dnmP4fpglNTZCuJpkbfiqFSCyNXv7muBwkBmvCWMIW4l3wIvTAu6EKm3toEn3VtyJ0Smrko0Q== 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 SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) by SA1PR11MB8279.namprd11.prod.outlook.com (2603:10b6:806:25c::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 13:45:07 +0000 Received: from SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107]) by SJ1PR11MB6129.namprd11.prod.outlook.com ([fe80::e90b:e018:1b70:f107%4]) with mapi id 15.20.7202.024; Fri, 19 Jan 2024 13:45:07 +0000 From: Yash.Shinde@windriver.com To: openembedded-core@lists.openembedded.org Cc: Randy.MacLeod@windriver.com, Umesh.Kallapa@windriver.com, Naveen.Gowda@windriver.com, Sundeep.Kokkonda@windriver.com, Shivaprasad.Moodalappa@windriver.com, Yash.Shinde@windriver.com Subject: [PATCH 5/5] Rust oe-selftest enabled. Date: Fri, 19 Jan 2024 05:43:52 -0800 Message-ID: <20240119134352.3163178-5-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240119134352.3163178-1-Yash.Shinde@windriver.com> References: <20240119134352.3163178-1-Yash.Shinde@windriver.com> X-ClientProxiedBy: CYZPR14CA0008.namprd14.prod.outlook.com (2603:10b6:930:8f::26) To SJ1PR11MB6129.namprd11.prod.outlook.com (2603:10b6:a03:488::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PR11MB6129:EE_|SA1PR11MB8279:EE_ X-MS-Office365-Filtering-Correlation-Id: e1078db5-edbb-4d15-208a-08dc18f4d920 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u6hEzglvm1xkPWSb11fiZ2Kdz2bq9Q4aTxjzasP/5adCIC58Ml14nwK5l5jncV6oUo42A3M0iPpHpBVHja3FTXQVvbk0E4GAJPxGqFNYbAeNuBQpqT37Oxix/lqfvoRQ8kIkVI67BC8ruOHubPRj7cPG/HT2j4qQ/mg0EEoCXIOrm+dA3wOTVK7xZIyJMDNIx65d2sXG24jhwbGePy76inYY1kIfPtByr8Co2bVPlJDUPO4FN69bXNuhz5meJyl9rncxQvZ2oKUO0nKEJcsj8Fw+Yl7bY7w7xVUz9R45AKRVak9nuoxORaIGWTbSUpzGRaBiwSbOVFBOSpW4DT3DLNYLFsG/ZtcfjdQljI0Xj3SNS1inL5+9ux9WtHLW3ObXJY9itLEE+BZfRugynb8aXKnG4EY7L3lmymC6LDDPDMnEKyAAoa7ZH+nSWcMyRffWAFaj310A4D2DuDeJvysALVstDxYhhGrCcT12xX3c8WjpnElVm9pwvpWy+/r2FlD6501Yvh5SGdZor2TDm8D8e8STLCfbX/Xt00uKY1/2UZqMObYPLLc7eO6K5+U89hBnH8AOKHbB83tI1LlogCMYlboBC8QAyT8EiO/wYDFwLRUNdUbo/y1iWrrcZPZe6ARNIViV8+9prXMCqZAP2z0eog== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ1PR11MB6129.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39850400004)(136003)(366004)(346002)(376002)(396003)(230173577357003)(230273577357003)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(38100700002)(66476007)(66946007)(66556008)(6506007)(6486002)(30864003)(316002)(6916009)(83380400001)(1076003)(2906002)(478600001)(26005)(8936002)(4326008)(86362001)(52116002)(6512007)(5660300002)(9686003)(107886003)(8676002)(2616005)(6666004)(41300700001)(36756003)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GNC0gI/vXpibsp1QgfGgnIvsdLLvDY67aIjB0RhOehmdyWeadhWTIMaxSuFNmUbb2F7yxhR4+P1dxQK8ES2miejzRNs7cgZ3QAeEgCohfMrj3w6oYC79HYDyeesOeiB+Sd+YMaIkOQh+ZGhE62srkz7XcMSNlJXGXoDAlmOKEIUiu2gngYJosADdFn/B9XXrKopxVh4uSwVB3PSdwUS+ApMaG6kx0kQgyLyEyVaplNLS2FRAn7b7oiqGn7HDvClloPxKfWN1WCzSLJ8btzXlFgQtWiLrH/HwbXBilzt/I1oa8Ivz6ThEA9imxkhvZ/GHIUI8O4LZ9C6T61X9mxXb+WkUKnNJn6XYRreTJ57Ozyou3ixvIJ6uqdYBgYKXwnmbmHX1jcH3cLRVuYNUjiI2O4EVD0L1B7v0lZzsAtEo9IKm1KatIdBXfEWS3KrB7BGE9/sBtid9foU9ynbtXAgHcZnpjfNWjwERlgTV4fkbBOvy20DmKQDWKP9kHwgHMNa9fKEA4waj4X7J0ixcSrT47GZ0P+OY/UFi+zJf27YtZOXX/MOUnlzzpY4kg/MOnYIwGDEk3daKU0ig2n0KL+2hGr3poNXx+RMX4k84L0oOWykLvEGiN/uFWTAPgEYhy6SzL84AoY57It945HAT9Yeyp5Z/k/sztubNA2Pl2XqrDOBB62xO7dwJUBHTmftRtSdyj5KzP3av+qNCmaTaL20vVAAYxfoEJVs5vZN3au8PyuIlflOdX/e+QtUfwDjo4MqU3bgprQvW4BhCG3WLirZCkKdnBLQcpV94pqJDa9zYNaQT81GzJAhV8HUrQwi/cafqlXhdsjDAAZvkhVA6KSHigfG4D2aLDGVKZRU7dSiuLlCxYAakoN6AIPJgPQ6IXr3Q0e91ChihD48iXAyF7bYlXDYmg/OoFlcbfRgKq4LbN2tT1lw69z1MxbYejiU9zP0P8Fn42L6tvr3EmhTR+6qnXjvi7SlftLg36NHywDuboMS3ByHS3a4teceh2T6Z/z389yM3HrDhix1yRAqx0wQEjMDc1/PFJtLmzomsLIrx6yVEKU+pZs7WMl2e/YIJ8BaTsNoq6J5FHxKUJZlr1CrAzCCWlccQg88ZskbmPrZm+h7CE+zqSBhz8kOGauAQtoDPDeXYc3ZUN3qERjhr4jUOh9d0wKI8ilKnKIvCbytyjVNE3EhKNTi+WUFCTJ56XBHK9ev40WhhetbcemoaprfGV8Ofm7UcdxRozDHkp+/5tZOgelkg2E3sOHPQ3LlAE1RLBJi4mLOIkE8/z3hHILFl9QQfgzIH98VzVNuTE2Y9VlRHhGLEDdc3TWoSocLvXeVU/4j4ywJmZlNBGSWBZ+UQqA5N/FoB1ZdT7t9WBMaMZ4k6gq0V02c+YgrTugmHH+yuop2JHh661OW/SjoxIUO47CmlSUVUzYBjYYyMoERRcnDr6YgQPWYcJyJPEgw8QLZXa3PO64lOw7BS1ruFLtl3BAt9XQIzBpYeDa8FxGQpanl+x87+HBa5Va43HGznjwoXoL8LNa2nWuI7sj1L89MNDRr4/K7klPkDU6p4IkjNMjTkRMjhhc/ZWRD/VeKVEXLtXbEahXLaMKNH04XVdmufWg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1078db5-edbb-4d15-208a-08dc18f4d920 X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6129.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 13:45:07.5488 (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: LY8i1vWqSAwRc1OBuMB3/k3qAWKHonH1Ns+wqVGWSKIGFP9VcIolANpeI7nWR0c+QE+M5EERdzuoKpEe7U7rvRKhEJ01mrS9Y+2haTH3U+4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB8279 X-Proofpoint-GUID: ue4KBD97bjOeRqp6bH4e0zllZntR6V8S X-Proofpoint-ORIG-GUID: ue4KBD97bjOeRqp6bH4e0zllZntR6V8S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-19_08,2024-01-19_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 adultscore=0 priorityscore=1501 spamscore=0 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2401190072 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, 19 Jan 2024 13:45:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194049 From: Yash Shinde Tests which are failing from below modules are added to exclude list tests/run-make tests/rustdoc tests/mir-opt tests/ui-fulldeps * Redundent test cases whose parent dir is also present in exclud list are removed. * Newly addded tests are sorted and updated. * Overall exclude tests count in exclude list is now reduced to 114. * The testing is done on arm32, arm64, mips64, x86 and x86_64 targets. Signed-off-by: Yash Shinde --- meta/lib/oeqa/selftest/cases/rust.py | 165 +++++---------------- meta/recipes-devtools/rust/rust-source.inc | 4 + 2 files changed, 43 insertions(+), 126 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/rust.py b/meta/lib/oeqa/selftest/cases/rust.py index 6dbc517006..7d0efb1b01 100644 --- a/meta/lib/oeqa/selftest/cases/rust.py +++ b/meta/lib/oeqa/selftest/cases/rust.py @@ -40,7 +40,7 @@ def parse_results(filename): class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): def test_rust(self, *args, **kwargs): # Disable Rust Oe-selftest - self.skipTest("The Rust Oe-selftest is disabled.") + #self.skipTest("The Rust Oe-selftest is disabled.") # build remote-test-server before image build recipe = "rust" @@ -73,156 +73,90 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): 'src/librustdoc', 'src/rustdoc-json-types', 'src/tools/compiletest/src/common.rs', + 'src/tools/jsondoclint', 'src/tools/lint-docs', + 'src/tools/replace-version-placeholder', 'src/tools/rust-analyzer', 'src/tools/rustdoc-themes', 'src/tools/tidy', 'tests/assembly/asm/aarch64-outline-atomics.rs', + 'tests/codegen/abi-efiapi.rs', + 'tests/codegen/abi-efiapi.rs', 'tests/codegen/abi-main-signature-32bit-c-int.rs', 'tests/codegen/abi-repr-ext.rs', + 'tests/codegen/abi-sysv64.rs', 'tests/codegen/abi-x86-interrupt.rs', + 'tests/codegen/align-byval.rs', + 'tests/codegen/align-fn.rs', + 'tests/codegen/asm-powerpc-clobbers.rs', + 'tests/codegen/async-fn-debug-awaitee-field.rs', + 'tests/codegen/binary-search-index-no-bound-check.rs', 'tests/codegen/branch-protection.rs', + 'tests/codegen/call-metadata.rs', 'tests/codegen/catch-unwind.rs', 'tests/codegen/cf-protection.rs', + 'tests/codegen/debug-column.rs', + 'tests/codegen/debug-limited.rs', + 'tests/codegen/debuginfo-generic-closure-env-names.rs', + 'tests/codegen/drop.rs', + 'tests/codegen/dst-vtable-align-nonzero.rs', + 'tests/codegen/enable-lto-unit-splitting.rs', 'tests/codegen/enum-bounds-check-derived-idx.rs', + 'tests/codegen/enum/enum-u128.rs', + 'tests/codegen/fn-impl-trait-self.rs', 'tests/codegen/force-unwind-tables.rs', + 'tests/codegen/inherit_overflow.rs', + 'tests/codegen/inherit_overflow.rs', + 'tests/codegen/inline-function-args-debug-info.rs', 'tests/codegen/intrinsic-no-unnamed-attr.rs', + 'tests/codegen/intrinsics/mask.rs', + 'tests/codegen/intrinsics/transmute-niched.rs', 'tests/codegen/issues/issue-103840.rs', 'tests/codegen/issues/issue-47278.rs', + 'tests/codegen/issues/issue-73258.rs', 'tests/codegen/issues/issue-73827-bounds-check-index-in-subexpr.rs', + 'tests/codegen/issues/issue-75546.rs', + 'tests/codegen/issues/issue-77812.rs', + 'tests/codegen/issues/issue-98156-const-arg-temp-lifetime.rs', 'tests/codegen/lifetime_start_end.rs', + 'tests/codegen/llvm-ident.rs', 'tests/codegen/local-generics-in-exe-internalized.rs', + 'tests/codegen/mainsubprogram.rs', 'tests/codegen/match-unoptimized.rs', + 'tests/codegen/move-operands.rs', 'tests/codegen/noalias-rwlockreadguard.rs', 'tests/codegen/non-terminate/nonempty-infinite-loop.rs', 'tests/codegen/noreturn-uninhabited.rs', 'tests/codegen/repr-transparent-aggregates-3.rs', + 'tests/codegen/repr/transparent-mips64.rs', 'tests/codegen/sse42-implies-crc32.rs', 'tests/codegen/thread-local.rs', 'tests/codegen/uninit-consts.rs', + 'tests/mir-opt/', 'tests/pretty/raw-str-nonexpr.rs', 'tests/run-make', - 'tests/run-make/cdylib-fewer-symbols/foo.rs', - 'tests/run-make/doctests-keep-binaries/t.rs', - 'tests/run-make-fulldeps', - 'tests/run-make/issue-22131/foo.rs', - 'tests/run-make/issue-36710/Makefile', - 'tests/run-make/issue-47551', - 'tests/run-make/pgo-branch-weights', - 'tests/run-make/pgo-gen', - 'tests/run-make/pgo-gen-lto', - 'tests/run-make/pgo-indirect-call-promotion', - 'tests/run-make/pgo-use', - 'tests/run-make/pointer-auth-link-with-c/Makefile', - 'tests/run-make/profile', - 'tests/run-make/static-pie', - 'tests/run-make/sysroot-crates-are-unstable', - 'tests/run-make/target-specs', 'tests/rustdoc', - 'tests/rustdoc/async-move-doctest.rs', - 'tests/rustdoc/async-trait.rs', - 'tests/rustdoc/auto-traits.rs', - 'tests/rustdoc/check-source-code-urls-to-def.rs', - 'tests/rustdoc/comment-in-doctest.rs', - 'tests/rustdoc/const-generics/const-generics-docs.rs', - 'tests/rustdoc/cross-crate-hidden-assoc-trait-items.rs', - 'tests/rustdoc/cross-crate-hidden-impl-parameter.rs', - 'tests/rustdoc/cross-crate-links.rs', - 'tests/rustdoc/cross-crate-primitive-doc.rs', - 'tests/rustdoc/doctest-manual-crate-name.rs', - 'tests/rustdoc/edition-doctest.rs', - 'tests/rustdoc/edition-flag.rs', - 'tests/rustdoc/elided-lifetime.rs', - 'tests/rustdoc/external-macro-src.rs', - 'tests/rustdoc/extern-html-root-url.rs', - 'tests/rustdoc/extern-impl-trait.rs', - 'tests/rustdoc/hide-unstable-trait.rs', - 'tests/rustdoc/inline_cross/add-docs.rs', - 'tests/rustdoc/inline_cross/default-trait-method.rs', - 'tests/rustdoc/inline_cross/dyn_trait.rs', - 'tests/rustdoc/inline_cross/impl_trait.rs', - 'tests/rustdoc/inline_cross/issue-24183.rs', - 'tests/rustdoc/inline_cross/macros.rs', - 'tests/rustdoc/inline_cross/trait-vis.rs', - 'tests/rustdoc/inline_cross/use_crate.rs', - 'tests/rustdoc/intra-doc-crate/self.rs', - 'tests/rustdoc/intra-doc/cross-crate/additional_doc.rs', - 'tests/rustdoc/intra-doc/cross-crate/basic.rs', - 'tests/rustdoc/intra-doc/cross-crate/crate.rs', - 'tests/rustdoc/intra-doc/cross-crate/hidden.rs', - 'tests/rustdoc/intra-doc/cross-crate/macro.rs', - 'tests/rustdoc/intra-doc/cross-crate/module.rs', - 'tests/rustdoc/intra-doc/cross-crate/submodule-inner.rs', - 'tests/rustdoc/intra-doc/cross-crate/submodule-outer.rs', - 'tests/rustdoc/intra-doc/cross-crate/traits.rs', - 'tests/rustdoc/intra-doc/extern-builtin-type-impl.rs', - 'tests/rustdoc/intra-doc/extern-crate-only-used-in-link.rs', - 'tests/rustdoc/intra-doc/extern-crate.rs', - 'tests/rustdoc/intra-doc/extern-inherent-impl.rs', - 'tests/rustdoc/intra-doc/extern-reference-link.rs', - 'tests/rustdoc/intra-doc/issue-103463.rs', - 'tests/rustdoc/intra-doc/issue-104145.rs', - 'tests/rustdoc/intra-doc/issue-66159.rs', - 'tests/rustdoc/intra-doc/pub-use.rs', - 'tests/rustdoc/intra-doc/reexport-additional-docs.rs', - 'tests/rustdoc/issue-18199.rs', - 'tests/rustdoc/issue-23106.rs', - 'tests/rustdoc/issue-23744.rs', - 'tests/rustdoc/issue-25944.rs', - 'tests/rustdoc/issue-30252.rs', - 'tests/rustdoc/issue-38129.rs', - 'tests/rustdoc/issue-40936.rs', - 'tests/rustdoc/issue-43153.rs', - 'tests/rustdoc/issue-46727.rs', - 'tests/rustdoc/issue-48377.rs', - 'tests/rustdoc/issue-48414.rs', - 'tests/rustdoc/issue-53689.rs', - 'tests/rustdoc/issue-54478-demo-allocator.rs', - 'tests/rustdoc/issue-57180.rs', - 'tests/rustdoc/issue-61592.rs', - 'tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs', - 'tests/rustdoc/issue-75588.rs', - 'tests/rustdoc/issue-85454.rs', - 'tests/rustdoc/issue-86620.rs', - 'tests/rustdoc-json', 'tests/rustdoc-js-std', - 'tests/rustdoc/macro_pub_in_module.rs', - 'tests/rustdoc/masked.rs', - 'tests/rustdoc/normalize-assoc-item.rs', - 'tests/rustdoc/no-stack-overflow-25295.rs', - 'tests/rustdoc/primitive-reexport.rs', - 'tests/rustdoc/process-termination.rs', - 'tests/rustdoc/pub-extern-crate.rs', - 'tests/rustdoc/pub-use-extern-macros.rs', - 'tests/rustdoc/reexport-check.rs', - 'tests/rustdoc/reexport-dep-foreign-fn.rs', - 'tests/rustdoc/reexport-doc.rs', - 'tests/rustdoc/reexports-priv.rs', - 'tests/rustdoc/reexports.rs', - 'tests/rustdoc/rustc,-incoherent-impls.rs', - 'tests/rustdoc/test_option_check/bar.rs', - 'tests/rustdoc/test_option_check/test.rs', - 'tests/rustdoc/trait-alias-mention.rs', - 'tests/rustdoc/trait-visibility.rs', + 'tests/rustdoc-json', 'tests/rustdoc-ui/cfg-test.rs', 'tests/rustdoc-ui/check-cfg-test.rs', 'tests/rustdoc-ui/display-output.rs', 'tests/rustdoc-ui/doc-comment-multi-line-attr.rs', 'tests/rustdoc-ui/doc-comment-multi-line-cfg-attr.rs', 'tests/rustdoc-ui/doc-test-doctest-feature.rs', + 'tests/rustdoc-ui/doc-test-rustdoc-feature.rs', 'tests/rustdoc-ui/doctest-multiline-crate-attribute.rs', 'tests/rustdoc-ui/doctest-output.rs', - 'tests/rustdoc-ui/doc-test-rustdoc-feature.rs', 'tests/rustdoc-ui/failed-doctest-compile-fail.rs', 'tests/rustdoc-ui/issue-80992.rs', 'tests/rustdoc-ui/issue-91134.rs', + 'tests/rustdoc-ui/no-run-flag.rs', 'tests/rustdoc-ui/nocapture-fail.rs', 'tests/rustdoc-ui/nocapture.rs', - 'tests/rustdoc-ui/no-run-flag.rs', 'tests/rustdoc-ui/run-directory.rs', 'tests/rustdoc-ui/test-no_std.rs', 'tests/rustdoc-ui/test-type.rs', - 'tests/rustdoc/unit-return.rs', + 'tests/ui-fulldeps/', 'tests/ui/abi/stack-probes-lto.rs', 'tests/ui/abi/stack-probes.rs', 'tests/ui/array-slice-vec/subslice-patterns-const-eval-match.rs', @@ -233,31 +167,10 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): 'tests/ui/debuginfo/debuginfo-emit-llvm-ir-and-split-debuginfo.rs', 'tests/ui/drop/dynamic-drop.rs', 'tests/ui/empty_global_asm.rs', - 'tests/ui-fulldeps/deriving-encodable-decodable-box.rs', - 'tests/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs', - 'tests/ui-fulldeps/deriving-global.rs', - 'tests/ui-fulldeps/deriving-hygiene.rs', - 'tests/ui-fulldeps/dropck_tarena_sound_drop.rs', - 'tests/ui-fulldeps/empty-struct-braces-derive.rs', - 'tests/ui-fulldeps/internal-lints/bad_opt_access.rs', - 'tests/ui-fulldeps/internal-lints/bad_opt_access.stderr', - 'tests/ui-fulldeps/internal-lints/default_hash_types.rs', - 'tests/ui-fulldeps/internal-lints/diagnostics.rs', - 'tests/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.rs', - 'tests/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.rs', - 'tests/ui-fulldeps/internal-lints/query_stability.rs', - 'tests/ui-fulldeps/internal-lints/rustc_pass_by_value.rs', - 'tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs', - 'tests/ui-fulldeps/issue-14021.rs', - 'tests/ui-fulldeps/lint-group-denied-lint-allowed.rs', - 'tests/ui-fulldeps/lint-group-forbid-always-trumps-cli.rs', - 'tests/ui-fulldeps/lint-pass-macros.rs', - 'tests/ui-fulldeps/regions-mock-tcx.rs', - 'tests/ui-fulldeps/rustc_encodable_hygiene.rs', - 'tests/ui-fulldeps/session-diagnostic/enforce_slug_naming.rs', 'tests/ui/functions-closures/fn-help-with-err.rs', 'tests/ui/linkage-attr/issue-10755.rs', 'tests/ui/macros/restricted-shadowing-legacy.rs', + 'tests/ui/numbers-arithmetic/u128.rs', 'tests/ui/process/nofile-limit.rs', 'tests/ui/process/process-panic-after-fork.rs', 'tests/ui/process/process-sigpipe.rs', diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 83a0dbc15f..e02829e6b3 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -10,6 +10,10 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0004-musl-Define-O_LARGEFILE-for-riscv32.patch;patchdir=${RUSTSRC} \ file://0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC} \ file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC} \ + file://cargo-path.patch;patchdir=${RUSTSRC} \ + file://custom-target-cfg.patch;patchdir=${RUSTSRC} \ + file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ + file://target-build-value.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e"