From f819b46acb497f7c1f1cd261f03a5714738b7110 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 12 Jun 2021 23:15:57 +0300 Subject: gnu: make-bootstrap: Build with gcc-7. * gnu/packages/make-bootstrap.scm (gcc-for-bootstrap)[Inherit]: Inherit from gcc-7. [inputs]: Use package-inputs from gcc-7. (package-with-relocatable-glibc)[native-inputs]: Have cross-gcc use gcc-7. (%gcc-static)[inherit]: Inherit from gcc-7. [arguments]: Use package-arguments from gcc-7. [inputs]: Replace isl-0.18 with isl. Use package-inputs from gcc-7. [native-inputs]: Use package-native-inputs from gcc-7. (%gcc-stripped)[inherit]: Inherit from gcc-7. --- gnu/packages/make-bootstrap.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index bf76d5052f..ff9376e91f 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2021 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Mark H Weaver ;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen @@ -94,13 +94,13 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (mlambdaq (glibc) "Return a variant of GCC that uses the bootstrap variant of GLIBC." (package - (inherit gcc-5) + (inherit gcc-7) (outputs '("out")) ;all in one so libgcc_s is easily found (inputs `( ;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap glibc)) ("libc:static" ,(glibc-for-bootstrap glibc) "static") - ,@(package-inputs gcc-5)))))) + ,@(package-inputs gcc-7)))))) (define (package-with-relocatable-glibc p) "Return a variant of P that uses the libc as defined by @@ -139,7 +139,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (cons (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") (files '("include"))) - (package-search-paths gcc-5))))) + (package-search-paths gcc-7))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap glibc)) @@ -461,11 +461,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc-5) + (package (inherit gcc-7) (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc-5) + (substitute-keyword-arguments (package-arguments gcc-7) ((#:modules modules %gnu-build-system-modules) `((srfi srfi-1) (srfi srfi-26) @@ -515,8 +515,8 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))))) (inputs `(("zlib:static" ,zlib "static") - ("isl:static" ,isl-0.18 "static") - ,@(package-inputs gcc-5))) + ("isl:static" ,isl "static") + ,@(package-inputs gcc-7))) (native-inputs (if (%current-target-system) `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both @@ -529,12 +529,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc-5)) - (package-native-inputs gcc-5)))))) + ,@(package-native-inputs gcc-7)) + (package-native-inputs gcc-7)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. - (package (inherit gcc-5) + (package (inherit gcc-7) (name "gcc-stripped") (build-system trivial-build-system) (source #f) -- cgit v1.2.3 From e48cff0965207c1abe2d6a71bd1277d8cc46e7c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 12 Jun 2021 23:21:02 +0300 Subject: gnu: make-bootstrap: Use guile-3.0 bootstrap tarball. * gnu/packages/make-bootstrap.scm (%guile-bootstrap-tarball): Use guile-3.0. (%guile-static-stripped): Remove variable. --- gnu/packages/make-bootstrap.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index ff9376e91f..d66acc2e70 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -55,7 +55,6 @@ %mes-bootstrap-tarball %bootstrap-tarballs - %guile-static-stripped %guile-3.0-static-stripped)) ;;; Commentary: @@ -799,12 +798,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (outputs '("out")) (synopsis "Minimal statically-linked and relocatable Guile"))) -(define %guile-static-stripped - ;; A stripped static Guile binary, for use during bootstrap. - (make-guile-static-stripped %guile-static)) - (define %guile-3.0-static-stripped - ;; A stripped static Guile 3.0 binary, for use in initrds. + ;; A stripped static Guile 3.0 binary, for use in initrds + ;; and during bootstrap. (make-guile-static-stripped (make-guile-static guile-3.0 '("guile-2.2-default-utf8.patch" @@ -867,7 +863,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %guile-bootstrap-tarball ;; A tarball with the statically-linked, relocatable Guile. - (tarball-package %guile-static-stripped)) + (tarball-package %guile-3.0-static-stripped)) (define %mescc-tools-bootstrap-tarball ;; A tarball with statically-linked MesCC binary seed. -- cgit v1.2.3 From 49e2e75ced01a821c84eb776cf42a36664eaa834 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 8 Jul 2021 09:39:05 +0300 Subject: gnu: %guile-3.0-static-stripped: Rename to %guile-static-stripped. * gnu/packages/make-bootstrap.scm (%guile-3.0-static-stripped): Rename to %guile-static-stripped. (%guile-bootstrap-tarball): Adjust accordingly. * gnu/system/linux-initrd.scm (expression->initrd): Use %guile-static-stripped as default guile. * doc/guix.texi (initial RAM disk)[expression->initrd]: Adjust documentation accordingly. --- doc/guix.texi | 2 +- gnu/packages/make-bootstrap.scm | 6 +++--- gnu/system/linux-initrd.scm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/doc/guix.texi b/doc/guix.texi index e11f7adebb..18bc600440 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32775,7 +32775,7 @@ program. That gives a lot of flexibility. The program to run in that initrd. @deffn {Scheme Procedure} expression->initrd @var{exp} @ - [#:guile %guile-3.0-static-stripped] [#:name "guile-initrd"] + [#:guile %guile-static-stripped] [#:name "guile-initrd"] Return as a file-like object a Linux initrd (a gzipped cpio archive) containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting. All the derivations referenced by @var{exp} are diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index d66acc2e70..cdcb1dcaa2 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -55,7 +55,7 @@ %mes-bootstrap-tarball %bootstrap-tarballs - %guile-3.0-static-stripped)) + %guile-static-stripped)) ;;; Commentary: ;;; @@ -798,7 +798,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (outputs '("out")) (synopsis "Minimal statically-linked and relocatable Guile"))) -(define %guile-3.0-static-stripped +(define %guile-static-stripped ;; A stripped static Guile 3.0 binary, for use in initrds ;; and during bootstrap. (make-guile-static-stripped @@ -863,7 +863,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %guile-bootstrap-tarball ;; A tarball with the statically-linked, relocatable Guile. - (tarball-package %guile-3.0-static-stripped)) + (tarball-package %guile-static-stripped)) (define %mescc-tools-bootstrap-tarball ;; A tarball with statically-linked MesCC binary seed. diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index c6ba9bb560..8c245b8445 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -36,7 +36,7 @@ #:use-module ((gnu packages xorg) #:select (console-setup xkeyboard-config)) #:use-module ((gnu packages make-bootstrap) - #:select (%guile-3.0-static-stripped)) + #:select (%guile-static-stripped)) #:use-module (gnu system file-systems) #:use-module (gnu system mapped-devices) #:use-module (gnu system keyboard) @@ -62,7 +62,7 @@ (define* (expression->initrd exp #:key - (guile %guile-3.0-static-stripped) + (guile %guile-static-stripped) (gzip gzip) (name "guile-initrd") (system (%current-system))) -- cgit v1.2.3