mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-30 22:35:57 +02:00
build-system/gnu: Unify with (guix build-system gnu-cross-build).
* guix/build/gnu-build-system.scm (set-paths): Add `native-inputs' and `native-search-paths' keyword parameters. Honor them. (configure): Add `target' and `native-inputs' keyword parameters. Look for Bash in NATIVE-INPUTS or INPUTS. Pass `--host' when TARGET is true. (strip): Add `strip-command' keyword parameter. Use it. * guix/build/gnu-cross-build.scm: Remove. * Makefile.am (MODULES): Adjust accordingly. * gnu/packages/acl.scm, gnu/packages/attr.scm, gnu/packages/base.scm, gnu/packages/bash.scm, gnu/packages/gawk.scm, gnu/packages/gettext.scm, gnu/packages/guile.scm, gnu/packages/libffi.scm, gnu/packages/libsigsegv.scm, gnu/packages/linux.scm, gnu/packages/ncurses.scm, gnu/packages/readline.scm, guix/build-system/gnu.scm: Replace `%standard-cross-phases' by `%standard-phases'. Remove references to (guix build gnu-cross-build).
This commit is contained in:
Ludovic Courtès
@@ -46,7 +46,7 @@
|
||||
(lambda _
|
||||
(patch-makefile-SHELL "include/buildmacros"))
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases
|
||||
'(alist-replace 'check
|
||||
(lambda _
|
||||
(system* "make" "tests" "-C" "test")
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
;; When building natively, adjust the test cases.
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases
|
||||
'(alist-replace 'check
|
||||
(lambda _
|
||||
;; Use the right shell.
|
||||
|
||||
@@ -293,9 +293,7 @@ The tools supplied with this package are:
|
||||
(substitute* (find-files "tests" "\\.sh$")
|
||||
(("#!/bin/sh")
|
||||
(format #f "#!~a/bin/bash" bash)))))
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases))))
|
||||
%standard-phases)))
|
||||
(synopsis "Core GNU utilities (file, text, shell)")
|
||||
(description
|
||||
"The GNU Core Utilities are the basic file, shell and text manipulation
|
||||
|
||||
@@ -82,9 +82,7 @@
|
||||
|
||||
#:phases (alist-cons-after 'install 'post-install
|
||||
,post-install-phase
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases))))
|
||||
%standard-phases)))
|
||||
(synopsis "The GNU Bourne-Again SHell")
|
||||
(description
|
||||
"Bash is the shell, or command language interpreter, that will appear in
|
||||
@@ -106,10 +104,7 @@ modification.")
|
||||
(let ((args `(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-1)
|
||||
(srfi srfi-26)
|
||||
,@(if (%current-target-system)
|
||||
'((guix build gnu-cross-build))
|
||||
'()))
|
||||
(srfi srfi-26))
|
||||
,@(package-arguments bash))))
|
||||
(substitute-keyword-arguments args
|
||||
((#:configure-flags flags)
|
||||
|
||||
@@ -50,9 +50,7 @@
|
||||
(substitute* "io.c"
|
||||
(("/bin/sh")
|
||||
(string-append bash "/bin/bash")))))
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases))))
|
||||
%standard-phases)))
|
||||
(inputs `(("libsigsegv" ,libsigsegv)
|
||||
|
||||
;; TODO: On next core-updates, make Bash input unconditional.
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
(arguments
|
||||
`(#:patches (list (assoc-ref %build-inputs "patch/gets"))
|
||||
#:phases ,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases
|
||||
'(alist-cons-before
|
||||
'check 'patch-tests
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
|
||||
@@ -158,9 +158,7 @@ extensible. It supports many SRFIs.")
|
||||
(substitute* "module/ice-9/popen.scm"
|
||||
(("/bin/sh")
|
||||
(string-append bash "/bin/bash")))))
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases))
|
||||
%standard-phases)
|
||||
|
||||
,@(if (%current-target-system)
|
||||
'(#:configure-flags '("CC_FOR_BUILD=gcc"))
|
||||
|
||||
@@ -49,15 +49,10 @@
|
||||
"0ln4jbpb6clcsdpb9niqk0frgx4k0xki96wiv067ig0q4cajb7aq"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments `(#:modules ((guix build utils) (guix build gnu-build-system)
|
||||
(ice-9 ftw) (srfi srfi-26)
|
||||
,@(if (%current-target-system)
|
||||
'((guix build gnu-cross-build))
|
||||
'()))
|
||||
(ice-9 ftw) (srfi srfi-26))
|
||||
#:phases (alist-cons-after 'install 'post-install
|
||||
,post-install-phase
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases))))
|
||||
%standard-phases)))
|
||||
(synopsis "Foreign function call interface library")
|
||||
(description
|
||||
"The libffi library provides a portable, high level programming interface
|
||||
|
||||
@@ -49,9 +49,7 @@
|
||||
(lambda _
|
||||
(substitute* "src/fault-linux-mips-old.h"
|
||||
(("#include <asm/sigcontext\\.h>") "")))
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases)))
|
||||
%standard-phases))
|
||||
'()))
|
||||
(description
|
||||
"GNU libsigsegv is a library for handling page faults in user mode. A page
|
||||
|
||||
@@ -80,18 +80,12 @@
|
||||
(arguments
|
||||
`(#:modules ((guix build gnu-build-system)
|
||||
(guix build utils)
|
||||
(srfi srfi-1)
|
||||
,@(if (%current-target-system)
|
||||
'((guix build gnu-cross-build))
|
||||
'()))
|
||||
(srfi srfi-1))
|
||||
#:phases (alist-replace
|
||||
'build ,(build-phase (%current-system))
|
||||
(alist-replace
|
||||
'install ,install-phase
|
||||
(alist-delete 'configure
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases))))
|
||||
(alist-delete 'configure %standard-phases)))
|
||||
#:tests? #f))
|
||||
(synopsis "GNU Linux-Libre kernel headers")
|
||||
(description "Headers of the Linux-Libre kernel.")
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
,cross-pre-install-phase
|
||||
(alist-cons-after
|
||||
'install 'post-install ,post-install-phase
|
||||
%standard-cross-phases)))
|
||||
%standard-phases)))
|
||||
|
||||
`(alist-cons-after ; native build
|
||||
'install 'post-install ,post-install-phase
|
||||
|
||||
@@ -61,9 +61,7 @@
|
||||
#:phases (alist-cons-after
|
||||
'install 'post-install
|
||||
,post-install-phase
|
||||
,(if (%current-target-system)
|
||||
'%standard-cross-phases
|
||||
'%standard-phases))))
|
||||
%standard-phases)))
|
||||
(synopsis "Edit command lines while typing, with history support")
|
||||
(description
|
||||
"The GNU Readline library provides a set of functions for use by
|
||||
|
||||
Reference in New Issue
Block a user