me
/
guix
Archived
1
0
Fork 0
Code

gnu: automake: Support cross-build. 

Automake does not cross-built properly: it lacks the concept of
<tool>-for-build.  It runs the host `autoconf' during build.

* gnu/packages/autotools.scm (automake)[inputs]: Add autoconf, bash-minimal
and perl.  To avoid triggering a rebuild, do this while cross-compiling only.
[arguments]: When cross-building, add `patch-non-shebang-references' phase to
substitute autoconf and perl.
master
Jan (janneke) Nieuwenhuizen 2020-04-18 19:50:06 +02:00 committed by Jan Nieuwenhuizen
parent b085d43633
commit d64a6d267d
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/packages/autotools.scm
View File

@ -293,6 +293,13 @@ output is indexed in many ways to simplify browsing.")
(patches (patches
(search-patches "automake-skip-amhello-tests.patch")))) (search-patches "automake-skip-amhello-tests.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs
;; TODO: remove `if' in the next rebuild cycle.
(if (%current-target-system)
`(("autoconf" ,autoconf-wrapper)
("bash" ,bash-minimal)
("perl" ,perl))
'()))
(native-inputs (native-inputs
`(("autoconf" ,autoconf-wrapper) `(("autoconf" ,autoconf-wrapper)
("perl" ,perl))) ("perl" ,perl)))
@ -301,7 +308,7 @@ output is indexed in many ways to simplify browsing.")
(variable "ACLOCAL_PATH") (variable "ACLOCAL_PATH")
(files '("share/aclocal"))))) (files '("share/aclocal")))))
(arguments (arguments
'(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
@ -330,6 +337,28 @@ output is indexed in many ways to simplify browsing.")
(string-append "exit 77\n" all "\n"))) (string-append "exit 77\n" all "\n")))
#t)) #t))
,@(if (%current-target-system)
`((add-after 'install 'patch-non-shebang-references
(lambda* (#:key build inputs outputs #: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 (assoc-ref inputs "autoconf"))
(bash (assoc-ref inputs "bash"))
(perl (assoc-ref inputs "perl"))
(out (assoc-ref outputs "out"))
(store-directory (%store-directory)))
(substitute* (find-files (string-append out "/bin"))
(((string-append store-directory "/[^/]*-autoconf-[^/]*"))
autoconf)
(((string-append store-directory "/[^/]*-bash-[^/]*"))
bash)
(((string-append store-directory "/[^/]*-perl-[^/]*"))
perl))
#t))))
'())
;; Files like `install-sh', `mdate.sh', etc. must use ;; Files like `install-sh', `mdate.sh', etc. must use
;; #!/bin/sh, otherwise users could leak erroneous shebangs ;; #!/bin/sh, otherwise users could leak erroneous shebangs
;; in the wild. See <http://bugs.gnu.org/14201> for an ;; in the wild. See <http://bugs.gnu.org/14201> for an