From patchwork Sun Jul 25 01:58:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thiago Jung Bauermann X-Patchwork-Id: 31591 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 39BCD27BC78; Sun, 25 Jul 2021 03:00:20 +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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable 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 C01DB27BC6B for ; Sun, 25 Jul 2021 03:00:19 +0100 (BST) Received: from localhost ([::1]:54748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m7TRC-0000gm-SY for patchwork@mira.cbaines.net; Sat, 24 Jul 2021 22:00:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m7TQw-0000gc-V6 for guix-patches@gnu.org; Sat, 24 Jul 2021 22:00:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m7TQw-0001kv-Ny for guix-patches@gnu.org; Sat, 24 Jul 2021 22:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m7TQw-0007Um-F0 for guix-patches@gnu.org; Sat, 24 Jul 2021 22:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49726] [PATCH core-updates] gnu: perl: Use =?utf-8?b?4oCYc2Vh?= =?utf-8?b?cmNoLWlucHV0LWZpbGXigJk=?= to find =?utf-8?b?4oCYYmluL3B3ZOKAmQ==?= Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Jul 2021 02:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49726 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49726@debbugs.gnu.org Cc: Thiago Jung Bauermann X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162717835028720 (code B ref -1); Sun, 25 Jul 2021 02:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2021 01:59:10 +0000 Received: from localhost ([127.0.0.1]:47275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m7TQ6-0007T9-60 for submit@debbugs.gnu.org; Sat, 24 Jul 2021 21:59:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:42210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m7TQ4-0007Sz-F0 for submit@debbugs.gnu.org; Sat, 24 Jul 2021 21:59:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m7TQ4-0000cV-0a for guix-patches@gnu.org; Sat, 24 Jul 2021 21:59:08 -0400 Received: from mx.kolabnow.com ([95.128.36.41]:24474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m7TQ1-00016t-1Y for guix-patches@gnu.org; Sat, 24 Jul 2021 21:59:06 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 45A00107C for ; Sun, 25 Jul 2021 03:59:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :message-id:date:date:subject:subject:from:from:received :received:received; s=dkim20160331; t=1627178339; x=1628992740; bh=uXmYc10+ypBt4jXso+eORzHLeV2doknz3jFyRH8b8Qs=; b=cOZWqlTB1ydP Ofr8N1bavoJe4qlW2GGwIc+YpcsV09WPM2CurksibXFANAteBJAYhsbLEQ80sZfB WebNHdS/cDxwKw65EeVHruo+x9Hglr1l07awh6cbI2r050yIHL3TzQKtkRYAqKwQ /y9Kf/lfXoJ5KFuhuCnV5A5fkIMyMNYKSGvVXDFZArg5sNklEd0HBNsgjj5Gyt01 WfyIeaWVIjAFFeGBz4DYN8vRXAOwfeEZZ+ohW6qKri9TRH12R8czQRI+6yQGQlux p9J4WRteLLz3yYf+WHjyKmrvMxm72pPlQDnVcy4djcDnLaLX5/munACLx97KCY95 f0DF1U9YSCCNWlRB4oA+0+uVWEpx4okWvrVjZQOALKBGN3zI4OvtP7C3PqKxTuvx 9ZBDdb6Yo8sICs953Zwrqzn2M237+gSs9n++NCTQCYL3K0ZnIA6r8GfM9Yss7sms NUommiai+gYgAN9kwRvpStOd0oMCa9frKapMMwM3ipkJ94wc68DFhfJ9oBKDlpgi AQv8xPfE7Ip/bRTpxoeY4iIgAuYSPMgNAl+kN9L2W8LU6yJwT1XbMZuGR4+oXcqX Smwoy0yE/wY9HAuH3vmBL3iDySHcQiGrpQBbJLVDtF6VytrwKvhlON5JNO50dhoA 5XU2vmQ1hFnxdnsBaCmNKGlfQziOHuI= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8CLw6E7C0tKR for ; Sun, 25 Jul 2021 03:58:59 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id C69D5E8C for ; Sun, 25 Jul 2021 03:58:58 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 28DE74A7D; Sun, 25 Jul 2021 03:58:57 +0200 (CEST) Date: Sat, 24 Jul 2021 22:58:26 -0300 Message-Id: <20210725015826.2095325-1-bauermann@kolabnow.com> MIME-Version: 1.0 Received-SPF: pass client-ip=95.128.36.41; envelope-from=bauermann@kolabnow.com; helo=mx.kolabnow.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, SPF_HELO_NONE=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" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches X-Patchwork-Original-From: Thiago Jung Bauermann via Guix-patches via From: Thiago Jung Bauermann X-getmail-retrieved-from-mailbox: Patches A recent change makes the ‘perl’ package explicitly reference input “coreutils” or “coreutils-minimal” by label in the ‘setup-configure’ phase but the ‘perl-boot0’ package, which uses ‘%boot0-inputs’ as its input list, doesn’t have such input on non-x86-linux systems. This causes the build of ‘perl-boot0’ to fail on those systems. Therefore use ‘search-input-file’ to find ‘bin/pwd’ and avoid referencing the input label. * gnu/packages/perl.scm (perl)[arguments]<#:phases>: Use ‘search-input-file’ to find ‘bin/pwd’. --- Hello, I verified that this fixes the build failure on powerpc64le-linux reported by the CI at https://ci.guix.gnu.org/build/691352/details . I believe it also fixes similar build failures for armhf-linux¹ and aarch64-linux², but I didn’t verify that yet. I can only try non-x86 builds using emulation which is very slow, so it will take a while to check armhf-linux and aarch64-linux but I’ll leave the builds running, for completeness. ¹ https://ci.guix.gnu.org/build/691416/details ² https://ci.guix.gnu.org/build/691343/details gnu/packages/perl.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 040898b42394..99a152e0abf0 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -124,18 +124,16 @@ (modify-phases %standard-phases (add-before 'configure 'setup-configure (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (or (assoc-ref inputs "coreutils-minimal") - (assoc-ref inputs "coreutils")))) - ;; Use the right path for `pwd'. - (substitute* "dist/PathTools/Cwd.pm" - (("'/bin/pwd'") - (string-append "'" coreutils "/bin/pwd'"))) - - ;; Build in GNU89 mode to tolerate C++-style comment in libc's - ;; . - (substitute* "cflags.SH" - (("-std=c89") - "-std=gnu89"))))) + ;; Use the right path for `pwd'. + (substitute* "dist/PathTools/Cwd.pm" + (("'/bin/pwd'") + (string-append "'" (search-input-file inputs "bin/pwd") "'"))) + + ;; Build in GNU89 mode to tolerate C++-style comment in libc's + ;; . + (substitute* "cflags.SH" + (("-std=c89") + "-std=gnu89")))) ,@(if (%current-target-system) `((add-after 'unpack 'unpack-cross (lambda* (#:key native-inputs inputs #:allow-other-keys)