diff options
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d3b13d9d5f6..2f0bb30b91b 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> | 3 | ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> |
| 4 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> | 4 | ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> |
| 5 | ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> | 5 | ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org> |
| 6 | ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 6 | ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> |
| 7 | ;;; | 7 | ;;; |
| 8 | ;;; This file is part of GNU Guix. | 8 | ;;; This file is part of GNU Guix. |
| @@ -125,6 +125,15 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 125 | (current-source-location) | 125 | (current-source-location) |
| 126 | #:native-inputs native-inputs)) | 126 | #:native-inputs native-inputs)) |
| 127 | 127 | ||
| 128 | (define static-bash-for-bootstrap | ||
| 129 | (package | ||
| 130 | (inherit static-bash) | ||
| 131 | (source (origin | ||
| 132 | (inherit (package-source static-bash)) | ||
| 133 | (patches | ||
| 134 | (cons (search-patch "bash-4.4-linux-pgrp-pipe.patch") | ||
| 135 | (origin-patches (package-source static-bash)))))))) | ||
| 136 | |||
| 128 | (define %static-inputs | 137 | (define %static-inputs |
| 129 | ;; Packages that are to be used as %BOOTSTRAP-INPUTS. | 138 | ;; Packages that are to be used as %BOOTSTRAP-INPUTS. |
| 130 | (let ((coreutils (package (inherit coreutils) | 139 | (let ((coreutils (package (inherit coreutils) |
| @@ -192,7 +201,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 192 | (("-Wl,-export-dynamic") "")) | 201 | (("-Wl,-export-dynamic") "")) |
| 193 | #t))))))) | 202 | #t))))))) |
| 194 | (inputs (if (%current-target-system) | 203 | (inputs (if (%current-target-system) |
| 195 | `(("bash" ,static-bash)) | 204 | `(("bash" ,static-bash-for-bootstrap)) |
| 196 | '())))) | 205 | '())))) |
| 197 | (tar (package (inherit tar) | 206 | (tar (package (inherit tar) |
| 198 | (arguments | 207 | (arguments |
| @@ -233,7 +242,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 233 | ("sed" ,sed) | 242 | ("sed" ,sed) |
| 234 | ("grep" ,grep) | 243 | ("grep" ,grep) |
| 235 | ("gawk" ,gawk))) | 244 | ("gawk" ,gawk))) |
| 236 | ("bash" ,static-bash)))) | 245 | ("bash" ,static-bash-for-bootstrap)))) |
| 237 | 246 | ||
| 238 | (define %static-binaries | 247 | (define %static-binaries |
| 239 | (package | 248 | (package |
