[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: autoconf: Fix cross-build.
From: |
guix-commits |
Subject: |
01/02: gnu: autoconf: Fix cross-build. |
Date: |
Thu, 11 May 2023 03:15:37 -0400 (EDT) |
janneke pushed a commit to branch master
in repository guix.
commit 741a587958ff0448f23c775ebd7667d2160a496a
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu May 11 08:57:11 2023 +0200
gnu: autoconf: Fix cross-build.
This is a follow-up to commit
8fa17cb6d51901b2c8a0e20954c5b19f8057c217
gnu: autoconf: Remove input labels.
* gnu/packages/autotools.scm (autoconf-2.69)[arguments]: Use "#~" instead of
"'".
---
gnu/packages/autotools.scm | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 14fa42eefa..37a64676a8 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;;
@@ -72,26 +72,26 @@
#:phases
#~(modify-phases %standard-phases
#$@(if (%current-target-system)
- '((add-after 'install 'patch-non-shebang-references
- (lambda* (#:key build inputs #:allow-other-keys)
- ;; `patch-shebangs' patches shebangs only, and the Perl
- ;; scripts use a re-exec feature that references the
- ;; build hosts' perl. Also, BASH and M4 store
references
- ;; hide in the scripts.
- (let ((bash (dirname (dirname
- (search-input-file inputs
"bin/bash"))))
- (m4 (dirname (dirname
- (search-input-file inputs
"bin/m4"))))
- (perl (dirname (dirname
- (search-input-file inputs
"bin/perl"))))
- (store-directory (%store-directory)))
- (substitute* (find-files (string-append #$output
"/bin"))
- (((string-append store-directory
"/[^/]*-bash-[^/]*"))
- bash)
- (((string-append store-directory "/[^/]*-m4-[^/]*"))
- m4)
- (((string-append store-directory
"/[^/]*-perl-[^/]*"))
- perl))))))
+ #~((add-after 'install 'patch-non-shebang-references
+ (lambda* (#:key build inputs #:allow-other-keys)
+ ;; `patch-shebangs' patches shebangs only, and the Perl
+ ;; scripts use a re-exec feature that references the
+ ;; build hosts' perl. Also, BASH and M4 store
references
+ ;; hide in the scripts.
+ (let ((bash (dirname (dirname
+ (search-input-file inputs
"bin/bash"))))
+ (m4 (dirname (dirname
+ (search-input-file inputs
"bin/m4"))))
+ (perl (dirname (dirname
+ (search-input-file inputs
"bin/perl"))))
+ (store-directory (%store-directory)))
+ (substitute* (find-files (string-append #$output
"/bin"))
+ (((string-append store-directory
"/[^/]*-bash-[^/]*"))
+ bash)
+ (((string-append store-directory
"/[^/]*-m4-[^/]*"))
+ m4)
+ (((string-append store-directory
"/[^/]*-perl-[^/]*"))
+ perl))))))
'())
(add-after 'install 'unpatch-shebangs
(lambda _