me
/
guix
Archived
1
0
Fork 0
Code

gnu: autoconf: Fix cross-build. 

This is a follow-up to commit
    8fa17cb6d5
    gnu: autoconf: Remove input labels.

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

42
gnu/packages/autotools.scm
View File

@ -10,7 +10,7 @@
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Pierre-Moana Levesque <pierre.moana.levesque@gmail.com> ;;; 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 © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; ;;;
@ -72,26 +72,26 @@
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
#$@(if (%current-target-system) #$@(if (%current-target-system)
'((add-after 'install 'patch-non-shebang-references #~((add-after 'install 'patch-non-shebang-references
(lambda* (#:key build inputs #:allow-other-keys) (lambda* (#:key build 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, BASH and M4 store references ;; build hosts' perl. Also, BASH and M4 store references
;; hide in the scripts. ;; hide in the scripts.
(let ((bash (dirname (dirname (let ((bash (dirname (dirname
(search-input-file inputs "bin/bash")))) (search-input-file inputs "bin/bash"))))
(m4 (dirname (dirname (m4 (dirname (dirname
(search-input-file inputs "bin/m4")))) (search-input-file inputs "bin/m4"))))
(perl (dirname (dirname (perl (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 "/[^/]*-bash-[^/]*")) (((string-append store-directory "/[^/]*-bash-[^/]*"))
bash) bash)
(((string-append store-directory "/[^/]*-m4-[^/]*")) (((string-append store-directory "/[^/]*-m4-[^/]*"))
m4) m4)
(((string-append store-directory "/[^/]*-perl-[^/]*")) (((string-append store-directory "/[^/]*-perl-[^/]*"))
perl)))))) perl))))))
'()) '())
(add-after 'install 'unpatch-shebangs (add-after 'install 'unpatch-shebangs
(lambda _ (lambda _