Browse Source
gnu: make-bootstrap: Remove duplicate definition of 'bash-static'.
* gnu/packages/make-bootstrap.scm (%bash-static): Remove.
(%static-inputs): Use STATIC-BASH instead of %BASH-STATIC.
version-0.12.0
Ludovic Courtès
6 years ago
No known key found for this signature in database
GPG Key ID: 90B11993D9AEBB5
1 changed files with
2 additions and
5 deletions
-
gnu/packages/make-bootstrap.scm
|
|
@ -114,9 +114,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." |
|
|
|
(current-source-location) |
|
|
|
#:native-inputs native-inputs)) |
|
|
|
|
|
|
|
(define %bash-static |
|
|
|
(static-package bash-minimal)) |
|
|
|
|
|
|
|
(define %static-inputs |
|
|
|
;; Packages that are to be used as %BOOTSTRAP-INPUTS. |
|
|
|
(let ((coreutils (package (inherit coreutils) |
|
|
@ -184,7 +181,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." |
|
|
|
(("-Wl,-export-dynamic") ""))) |
|
|
|
,phases))))) |
|
|
|
(inputs (if (%current-target-system) |
|
|
|
`(("bash" ,%bash-static)) |
|
|
|
`(("bash" ,static-bash)) |
|
|
|
'())))) |
|
|
|
(finalize (compose static-package |
|
|
|
package-with-relocatable-glibc))) |
|
|
@ -200,7 +197,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." |
|
|
|
("sed" ,sed) |
|
|
|
("grep" ,grep) |
|
|
|
("gawk" ,gawk))) |
|
|
|
("bash" ,%bash-static)))) |
|
|
|
("bash" ,static-bash)))) |
|
|
|
|
|
|
|
(define %static-binaries |
|
|
|
(package |
|
|
|