[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/43: gnu: autoconf: Support cross-build.
From: |
guix-commits |
Subject: |
02/43: gnu: autoconf: Support cross-build. |
Date: |
Mon, 20 Apr 2020 07:34:01 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 5fb6d3d4dd2aff7f8bb924b4d92539d31c2550fb
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat Apr 18 19:49:54 2020 +0200
gnu: autoconf: Support cross-build.
Autoconf cannot be cross-built properly: it lacks the concept of
<tool>-for-build. It runs the host `autom4te' (a perl script) during build.
* gnu/packages/autotools.scm (autoconf)[inputs]: When cross-building, add
perl
and m4.
[native-inputs]: when cross-building, use -for-build names.
[arguments]: When cross-building, add `fake-cross-build' phase to substitute
m4 and perl.
---
gnu/packages/autotools.scm | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm
index 99ca527..91d2c8a 100644
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -55,12 +55,37 @@
(base32
"113nlmidxy9kjr45kg9x3ngar4951mvag1js2a3j8nxcz34wxsv4"))))
(build-system gnu-build-system)
+ (inputs
+ (if (%current-target-system)
+ `(("perl" ,perl)
+ ("m4" ,m4))
+ '()))
(native-inputs
- `(("perl" ,perl)
- ("m4" ,m4)))
+ (if (%current-target-system)
+ `(("perl-for-build" ,perl)
+ ("m4-for-build" ,m4))
+ `(("perl" ,perl)
+ ("m4" ,m4))))
;; XXX: testsuite: 209 and 279 failed. The latter is an impurity. It
;; should use our own "cpp" instead of "/lib/cpp".
- (arguments `(#:tests? #f))
+ (arguments
+ `(#:tests? #f
+ ,@(if (%current-target-system)
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; Autoconf cannot be cross-built properly: it lacks the
+ ;; concept of <tool>-for-build. It even runs the host
+ ;; `autom4te' (a perl script) during build.
+ (add-after 'install 'fake-cross-build
+ (lambda* (#:key build inputs outputs #:allow-other-keys)
+ (let ((m4 (assoc-ref inputs "m4"))
+ (perl (assoc-ref inputs "perl"))
+ (out (assoc-ref outputs "out")))
+ (substitute* (find-files (string-append out "/bin"))
+ (("/gnu/store/[^/]*-m4-[^/]*") m4)
+ (("/gnu/store/[^/]*-perl-[^/]*") perl))
+ #t)))))
+ '())))
(home-page "https://www.gnu.org/software/autoconf/")
(synopsis "Create source code configuration scripts")
(description
- branch wip-hurd-vm created (now 08ddea3), guix-commits, 2020/04/20
- 03/43: gnu: automake: Support cross-build., guix-commits, 2020/04/20
- 05/43: vm: Make the device node procedure a parameter., guix-commits, 2020/04/20
- 02/43: gnu: autoconf: Support cross-build.,
guix-commits <=
- 01/43: tests: Update expected values for package->code., guix-commits, 2020/04/20
- 08/43: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/20
- 07/43: gnu: hurd: Fix references to /bin/w., guix-commits, 2020/04/20
- 06/43: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/20
- 09/43: gnu: Add dde-sources., guix-commits, 2020/04/20
- 16/43: services: Add hurd-console-service-type., guix-commits, 2020/04/20
- 04/43: gnu: texinfo: Cross-build fix: Use host perl in host scripts., guix-commits, 2020/04/20
- 11/43: gnu: hurd: Add NFS support., guix-commits, 2020/04/20
- 13/43: system: hurd: Add less, which to %base-packages/hurd., guix-commits, 2020/04/20
- 14/43: system: hurd: Add /etc/group., guix-commits, 2020/04/20