From patchwork Sat Apr 3 04:38:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5a6L5paH5q2m?= X-Patchwork-Id: 28310 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 96F5B27BC66; Sat, 3 Apr 2021 05:51:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDCB227BC65 for ; Sat, 3 Apr 2021 05:51:09 +0100 (BST) Received: from localhost ([::1]:44862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSYFY-0005Mc-W3 for patchwork@mira.cbaines.net; Sat, 03 Apr 2021 00:51:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSYFS-0005MQ-PI for guix-patches@gnu.org; Sat, 03 Apr 2021 00:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lSYFS-0001L4-IX for guix-patches@gnu.org; Sat, 03 Apr 2021 00:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lSYFS-0000Eb-H8 for guix-patches@gnu.org; Sat, 03 Apr 2021 00:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47577] [core-updates] gnu: meson-for-build: Remove it again Resent-From: =?utf-8?b?5a6L5paH5q2m?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Apr 2021 04:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47577@debbugs.gnu.org, efraim@flashner.co.il X-Debbugs-Original-To: guix-patches@gnu.org, Efraim Flashner Received: via spool by submit@debbugs.gnu.org id=B.1617425441864 (code B ref -1); Sat, 03 Apr 2021 04:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2021 04:50:41 +0000 Received: from localhost ([127.0.0.1]:33107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSYF6-0000Ds-Na for submit@debbugs.gnu.org; Sat, 03 Apr 2021 00:50:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:46470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lSYF4-0000Dk-NH for submit@debbugs.gnu.org; Sat, 03 Apr 2021 00:50:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSYF4-0005LG-Eu for guix-patches@gnu.org; Sat, 03 Apr 2021 00:50:38 -0400 Received: from mail-oln040092254046.outbound.protection.outlook.com ([40.92.254.46]:6033 helo=APC01-PU1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSYF1-00011G-13 for guix-patches@gnu.org; Sat, 03 Apr 2021 00:50:38 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QScpUCWDK1hjVcU+fpSTMLkK7lbf8lbCWg1o1BF8KIImwqAqC2RY6mzpQw1bvxbsScRt9lu/ROqSEelLACDOfPJhLn/PYqlORbZDY9HQVwa9ylfbktkGBtxAcqitQLXD33BgTabpAgEXsNOn5JjomGG2xW3gcMJwEVBCL6ibpI7AKeRS7yyA7tHwJyfVNO0sg5QMw9mwCiC6NyVHXBSrhgMuM0TyH/3AYdDrJ9sSeuTfAFFbcpycUQNotfbuXaHnYSMtJRQN2MQ3qrxKJVFerN/cItJx8rnilz4z1BZK92ytq4sBKfm1DAGnub9EqBFPP3OZRH019tWIa6jYWdNNQA== 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-SenderADCheck; bh=6XislTWVCnXlmP0kON/JeHVAvz/omrDG74Hhe4IF3+U=; b=aSqOxSDgEjtVx75wkDc1MfxLAfJI6OC1qw2QAwBal/7pBepzqvs0v3Qkkq+mDc8sE8cZ6bDGBUXH5d/1Tf1HCixBTkCOndj6gZw8ZtTViGF1fiFrQU8e65U9JQX4qNCx9C+xM3/Gc8EoJ63eRStqODgQpWP7tywExgbHu9S35uU9FyAQFipDH2gmPS1scAAPJyhQUrJunztya5mDMHiNuAIQrTaZSKt7cCda2FbQS41vlOBvqngSe9BrvpLei1aHaPnCj6IwuRdheOGwUwuInmBAPAkBf6L0mbayasiAlAU8bjGZ8ZN86LqSllkWZInkDB1QwUkusmJe9l5TVyWa9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6XislTWVCnXlmP0kON/JeHVAvz/omrDG74Hhe4IF3+U=; b=ghJX5W6AzXLbr0UV4xZujDjSJq9GCcZOcnzcSBp+iK5zMrke6mE6ggfyMdW3KILKhJB0FO3CXkKMfHzEYuIRIqnbhZh0+CrcjHPuN+F3YZw1ZLib8knxISTcFVOHnx+ZRxjxj6qGKu1mzkCBpvVR8otpv++JEV2aDAUy/5YV9PNP9VcFbl36rL4girCvo4XVRBnUX50GNd0lxaPJhwEd+QB40zKyO6Pryy40FkmdtyCovr3crnR5fS8TMzIDcmTxUNVU1oYN5M27IhAqUyELVuhNl/rVkdNjBjGwhk0i0B0y7dwl3o8uUyUnS5niLoUaR5hROvAwwK5JQexCbZSEgQ== Received: from HK2APC01FT005.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::49) by HK2APC01HT153.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::468) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Sat, 3 Apr 2021 04:35:17 +0000 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2a01:111:e400:7ebc::45) by HK2APC01FT005.mail.protection.outlook.com (2a01:111:e400:7ebc::148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Sat, 3 Apr 2021 04:35:17 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:6E891CC1F1A3354FCDBF64AD4C8933025EC22736D91F6C32A7CC6B3C48B7E2E5; UpperCasedChecksum:307A5D54DC07A02B489375E13600D91EC509E0FA3E683D77451187665E6E23AA; SizeAsReceived:7280; Count:42 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM ([fe80::3077:ff28:1097:42cd]) by OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM ([fe80::3077:ff28:1097:42cd%6]) with mapi id 15.20.3999.032; Sat, 3 Apr 2021 04:35:17 +0000 From: =?utf-8?b?5a6L5paH5q2m?= Date: Sat, 03 Apr 2021 12:38:02 +0800 Message-ID: X-TMN: [OZR0ESH4PfYOrqxZvW4bILFGS1pYN7Iknnnnahc6z6DlD1P5VqKEQEMJFv6d0dDK] X-ClientProxiedBy: HK2PR06CA0020.apcprd06.prod.outlook.com (2603:1096:202:2e::32) To OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:ec::11) X-Microsoft-Original-Message-ID: <87wntkdlud.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (2409:8a62:376:7f20:2f1:f5ff:fe18:6bb) by HK2PR06CA0020.apcprd06.prod.outlook.com (2603:1096:202:2e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Sat, 3 Apr 2021 04:35:16 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 42 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 4fd9d776-d5e7-4cee-0d6e-08d8f659e19f X-MS-TrafficTypeDiagnostic: HK2APC01HT153: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: atl3489GEs18Gg9RTzF2Nuk9o8ej1FNW/LUmFTsfyhGTM7CxuQOekXLn/Ay1Qqs75/75lxb1mcxOjs2PvRorzqsps+qky9k6YsMgbkAwWlqZPijmlQZoZDfrfALndMU/eXtSWVz1/PYbLW8SG5yrm7NMKtez4lF51V7XdW/FsLATEtKKSmx/Dr+qrjrU8fpll4cW8RR0il2Xy50YT2p3IiRpBnwwTAPwen8iM7p7jDAUKtwHbnK8EL0WI7873key303/dZhaAiiHEOTXxr+ExHlZWxWn6wL1hEpUUzLU/baMg5VCUcpgyMh4sKSJPUcFvmurSqjao8sAk71vCZ3N5BXk/+lO9dCNfUJ158YQDLoWXAM71KJyGrdbeNtRlQ1IVidZpeEq42upFE4Evj2hnw== X-MS-Exchange-AntiSpam-MessageData: jKuxYbAyvvEFnH47tegtv2fgMCGiVn8eyzFrX8+VVGXjH5+qzKeIbKaSrnaDZZX3sv7MxrX5IlqheqdygMTIon3zmNYEQGSw/njTlMfJXQFkx++DpPxFF0ds8/mebFoEVXkBlMNikv30GLfpvdNv1Y1UTK4VP5pT89515fK4MYecl/XebgpboZ94cWhaKyUgTaq7gPhmVPda8011bLd8CQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fd9d776-d5e7-4cee-0d6e-08d8f659e19f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2021 04:35:17.3681 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HK2APC01FT005.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2APC01HT153 Received-SPF: pass client-ip=40.92.254.46; envelope-from=iyzsong@outlook.com; helo=APC01-PU1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, on our core-updates branch, meson-for-build was remmoved in f2b228010873a, but then a merge 2aab587f842908 added it again.. So here is a patch to remove it, also update the FIXME in meson: From 3219f0b132c8ae16e319a57a91834ec8be393afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 3 Apr 2021 12:26:03 +0800 Subject: [PATCH] gnu: meson-for-build: Remove package. It was removed in commit f2b22801, but a merge (2aab587f) add it wrongly again. --- gnu/packages/build-tools.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 5e25c60f3b..b47a790f75 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -278,9 +278,8 @@ files and generates build instructions for the Ninja build system.") "1x47vc7023w8w90r6jda5hk2jsh68i66x49gckdgixw32fwvvf1w")))) (build-system python-build-system) (arguments - `(;; FIXME: Tests require many additional inputs, a fix for the RUNPATH - ;; patch in meson-for-build, and patching many hard-coded file system - ;; locations in "run_unittests.py". + `(;; FIXME: Tests require many additional inputs and patching many + ;; hard-coded file system locations in "run_unittests.py". #:tests? #f #:phases (modify-phases %standard-phases ;; Meson calls the various executables in out/bin through the @@ -327,17 +326,6 @@ resembles Python.") (base32 "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj")))))) -(define-public meson-for-build - (package - (inherit meson) - (name "meson-for-build") - (source (origin - (inherit (package-source meson)) - (patches (search-patches "meson-for-build-rpath.patch")))) - - ;; People should probably install "meson", not "meson-for-build". - (properties `((hidden? . #t))))) - (define-public premake4 (package (name "premake") -- 2.30.0