all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Thiago Jung Bauermann via Guix-patches via <guix-patches@gnu.org>
To: 49726@debbugs.gnu.org
Cc: Thiago Jung Bauermann <bauermann@kolabnow.com>
Subject: [bug#49726] [PATCH core-updates] gnu: perl: Use ‘search-input-file’ to find ‘bin/pwd’
Date: Sat, 24 Jul 2021 22:58:26 -0300	[thread overview]
Message-ID: <20210725015826.2095325-1-bauermann@kolabnow.com> (raw)

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
-               ;; <bits/string3.h>.
-               (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
+             ;; <bits/string3.h>.
+             (substitute* "cflags.SH"
+               (("-std=c89")
+                "-std=gnu89"))))
          ,@(if (%current-target-system)
                `((add-after 'unpack 'unpack-cross
                    (lambda* (#:key native-inputs inputs #:allow-other-keys)




             reply	other threads:[~2021-07-25  2:00 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-25  1:58 Thiago Jung Bauermann via Guix-patches via [this message]
2021-07-25  9:24 ` bug#49726: [PATCH core-updates] gnu: perl: Use ‘search-input-file’ to find ‘bin/pwd’ Efraim Flashner
2021-07-25 15:34   ` [bug#49726] " Thiago Jung Bauermann via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210725015826.2095325-1-bauermann@kolabnow.com \
    --to=guix-patches@gnu.org \
    --cc=49726@debbugs.gnu.org \
    --cc=bauermann@kolabnow.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.