[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: automake: Fix cross-build.
From: |
guix-commits |
Subject: |
02/02: gnu: automake: Fix cross-build. |
Date: |
Thu, 11 May 2023 03:15:37 -0400 (EDT) |
janneke pushed a commit to branch master
in repository guix.
commit 705ddc6a4f2dcb53e3dd046153e684723b284163
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Thu May 11 08:58:37 2023 +0200
gnu: automake: Fix cross-build.
This is a follow-up to commit
ea908c1c04804e51dbd156981c21d8397367d40d
gnu: automake: Remove input labels.
* gnu/packages/autotools.scm (automake)[arguments]: Use "#~" instead of "'".
---
gnu/packages/autotools.scm | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 37a64676a8..fc6bb196f1 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -369,29 +369,29 @@ output is indexed in many ways to simplify browsing.")
(string-append "exit 77\n" all "\n")))))
#$@(if (%current-target-system)
- '((add-after 'install 'patch-non-shebang-references
- (lambda* (#:key 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, AUTOCONF and BASH store
- ;; references hide in the scripts.
- (let ((autoconf
- (dirname (dirname
- (search-input-file inputs
"bin/autoconf"))))
- (bash
- (dirname (dirname
- (search-input-file inputs
"bin/bash"))))
- (perl
- (dirname (dirname
- (search-input-file inputs
"bin/perl"))))
- (store-directory (%store-directory)))
- (substitute* (find-files (string-append #$output
"/bin"))
- (((string-append store-directory
"/[^/]*-autoconf-[^/]*"))
- autoconf)
- (((string-append store-directory
"/[^/]*-bash-[^/]*"))
- bash)
- (((string-append store-directory
"/[^/]*-perl-[^/]*"))
- perl))))))
+ #~((add-after 'install 'patch-non-shebang-references
+ (lambda* (#:key 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, AUTOCONF and BASH store
+ ;; references hide in the scripts.
+ (let ((autoconf
+ (dirname (dirname
+ (search-input-file inputs
"bin/autoconf"))))
+ (bash
+ (dirname (dirname
+ (search-input-file inputs
"bin/bash"))))
+ (perl
+ (dirname (dirname
+ (search-input-file inputs
"bin/perl"))))
+ (store-directory (%store-directory)))
+ (substitute* (find-files (string-append #$output
"/bin"))
+ (((string-append store-directory
"/[^/]*-autoconf-[^/]*"))
+ autoconf)
+ (((string-append store-directory
"/[^/]*-bash-[^/]*"))
+ bash)
+ (((string-append store-directory
"/[^/]*-perl-[^/]*"))
+ perl))))))
'())
;; Files like `install-sh', `mdate.sh', etc. must use