me
/
guix
Archived
1
0
Fork 0
Code

gnu: automake: Fix cross-build. 

This is a follow-up to commit
    ea908c1c04
    gnu: automake: Remove input labels.

* gnu/packages/autotools.scm (automake)[arguments]: Use "#~" instead of "'".
master
Janneke Nieuwenhuizen 2023-05-11 08:58:37 +02:00
parent 741a587958
commit 705ddc6a4f
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gnu/packages/autotools.scm
View File

@ -369,29 +369,29 @@ output is indexed in many ways to simplify browsing.")
(string-append "exit 77\n" all "\n"))))) (string-append "exit 77\n" all "\n")))))
#$@(if (%current-target-system) #$@(if (%current-target-system)
'((add-after 'install 'patch-non-shebang-references #~((add-after 'install 'patch-non-shebang-references
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; `patch-shebangs' patches shebangs only, and the Perl ;; `patch-shebangs' patches shebangs only, and the Perl
;; scripts use a re-exec feature that references the ;; scripts use a re-exec feature that references the
;; build hosts' perl. Also, AUTOCONF and BASH store ;; build hosts' perl. Also, AUTOCONF and BASH store
;; references hide in the scripts. ;; references hide in the scripts.
(let ((autoconf (let ((autoconf
(dirname (dirname (dirname (dirname
(search-input-file inputs "bin/autoconf")))) (search-input-file inputs "bin/autoconf"))))
(bash (bash
(dirname (dirname (dirname (dirname
(search-input-file inputs "bin/bash")))) (search-input-file inputs "bin/bash"))))
(perl (perl
(dirname (dirname (dirname (dirname
(search-input-file inputs "bin/perl")))) (search-input-file inputs "bin/perl"))))
(store-directory (%store-directory))) (store-directory (%store-directory)))
(substitute* (find-files (string-append #$output "/bin")) (substitute* (find-files (string-append #$output "/bin"))
(((string-append store-directory "/[^/]*-autoconf-[^/]*")) (((string-append store-directory "/[^/]*-autoconf-[^/]*"))
autoconf) autoconf)
(((string-append store-directory "/[^/]*-bash-[^/]*")) (((string-append store-directory "/[^/]*-bash-[^/]*"))
bash) bash)
(((string-append store-directory "/[^/]*-perl-[^/]*")) (((string-append store-directory "/[^/]*-perl-[^/]*"))
perl)))))) perl))))))
'()) '())
;; Files like `install-sh', `mdate.sh', etc. must use ;; Files like `install-sh', `mdate.sh', etc. must use