mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 15:26:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove unnecessary uses of 'package-with-bootstrap-guile'.

Browse source 
This reduces the object graph returned by:

  guix graph -e '(@@ (gnu packages commencement) glibc-final-with-bootstrap-bash)

from 333 nodes (1542 edges) to 148 nodes (886 edges).

This improves 'package-derivation' memoization and, consequently, the
'add-data-to-store' cache shown by:

  GUIX_PROFILING=add-data-to-store-cache guix build coreutils -nd

goes from 10948 lookups to 8935 lookups.

* gnu/packages/commencement.scm (mes-boot): Remove call to
'package-with-bootstrap-guile'.  Call 'bootstrap-origin' on the source
of NYACC-0.86.
(tcc-boot0): Likewise.
(tcc-boot): Remove call to 'package-with-bootstrap-guile' and call
'bootstrap-origin' on its source.
(make-mesboot0): Remove call to 'package-with-bootstrap-guile'.
(diffutils-mesboot): Likewise.
(binutils-mesboot0): Likewise, and call 'bootstrap-origin' for its
source.
(gcc-core-mesboot): Likewise.
(mesboot-headers): Remove call to 'package-with-bootstrap-guile'.
(glibc-mesboot0): Likewise, and call 'bootstrap-origin' for its source.
(gcc-mesboot0): Remove call to 'package-with-bootstrap-guile'.
(binutils-mesboot): Likewise.
(make-mesboot): Likewise.
(gcc-mesboot1): Likewise, and call 'bootstrap-origin' for its source.
(gcc-mesboot1-wrapper): Remove call to 'package-with-bootstrap-guile'.
(glibc-headers-mesboot): Likewise, and call 'bootstrap-origin' for its
source.
(glibc-mesboot): Remove call to 'package-with-bootstrap-guile'.
(gcc-mesboot): Likewise, and call to 'bootstrap-origin' for its source.
(gcc-mesboot-wrapper): Remove call to 'package-with-bootstrap-guile'.
(m4-mesboot): Likewise.
(gnu-make-boot0): Likewise, and call 'bootstrap-origin' for its source.
This commit is contained in:
Ludovic Courtès 2019-10-11 17:23:13 +02:00
parent 5b811ddc67
commit 9a45a24f7f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 1156 additions and 1163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
gnu/packages/commencement.scm
View file

@ -85,7 +85,6 @@ (define-module (gnu packages commencement)
;;; Code: ;;; Code:
(define mes-boot (define mes-boot
(package-with-bootstrap-guile
(package (package
(inherit mes) (inherit mes)
(name "mes-boot") (name "mes-boot")
@ -101,7 +100,8 @@ (define mes-boot
(propagated-inputs '()) (propagated-inputs '())
(native-inputs (native-inputs
`(("mescc-tools" ,%bootstrap-mescc-tools) `(("mescc-tools" ,%bootstrap-mescc-tools)
("nyacc-source" ,(package-source nyacc-0.86)) ("nyacc-source" ,(bootstrap-origin
(package-source nyacc-0.86)))
("coreutils" , %bootstrap-coreutils&co) ("coreutils" , %bootstrap-coreutils&co)
("bootstrap-mes" ,%bootstrap-mes))) ("bootstrap-mes" ,%bootstrap-mes)))
@ -158,7 +158,7 @@ (define mes-boot
(files '("share/mes/include"))) (files '("share/mes/include")))
(search-path-specification (search-path-specification
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("share/mes/lib")))))))) (files '("share/mes/lib")))))))
(define tcc-boot0 (define tcc-boot0
;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11 ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11
@ -170,7 +170,6 @@ (define tcc-boot0
(let ((version "0.9.26") (let ((version "0.9.26")
(revision "6") (revision "6")
(commit "c004e9a34fb026bb44d211ab98bb768e79900eef")) (commit "c004e9a34fb026bb44d211ab98bb768e79900eef"))
(package-with-bootstrap-guile
(package (package
(inherit tcc) (inherit tcc)
(name "tcc-boot0") (name "tcc-boot0")
@ -190,7 +189,8 @@ (define tcc-boot0
(native-inputs (native-inputs
`(("mes" ,mes-boot) `(("mes" ,mes-boot)
("mescc-tools" ,%bootstrap-mescc-tools) ("mescc-tools" ,%bootstrap-mescc-tools)
("nyacc-source" ,(package-source nyacc-0.86)) ("nyacc-source" ,(bootstrap-origin
(package-source nyacc-0.86)))
("coreutils" , %bootstrap-coreutils&co) ("coreutils" , %bootstrap-coreutils&co)
("bootstrap-mes" ,%bootstrap-mes))) ("bootstrap-mes" ,%bootstrap-mes)))
@ -274,17 +274,17 @@ (define tcc-boot0
(files '("include"))) (files '("include")))
(search-path-specification (search-path-specification
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("lib"))))))))) (files '("lib"))))))))
(define tcc-boot (define tcc-boot
(package-with-bootstrap-guile
(package (package
(inherit tcc-boot0) (inherit tcc-boot0)
(name "tcc-boot") (name "tcc-boot")
(version "0.9.27") (version "0.9.27")
(source (origin (source (bootstrap-origin
(origin
(inherit (package-source tcc)) (inherit (package-source tcc))
(patches (search-patches "tcc-boot-0.9.27.patch")))) (patches (search-patches "tcc-boot-0.9.27.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs '()) (inputs '())
(propagated-inputs '()) (propagated-inputs '())
@ -296,9 +296,11 @@ (define tcc-boot
(arguments (arguments
`(#:implicit-inputs? #f `(#:implicit-inputs? #f
#:guile ,%bootstrap-guile #:guile ,%bootstrap-guile
#:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2
; binaries, tcc-boot also comes with ;; Binutils' 'strip' b0rkes MesCC/M1/hex2 binaries, tcc-boot also comes
; MesCC/M1/hex2-built binaries ;; with MesCC/M1/hex2-built binaries.
#:strip-binaries? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -344,7 +346,8 @@ (define tcc-boot
"-D" "CONFIG_USE_LIBGCC=1" "-D" "CONFIG_USE_LIBGCC=1"
"-D" (string-append "CONFIG_TCCDIR=\"" out "/lib/tcc\"") "-D" (string-append "CONFIG_TCCDIR=\"" out "/lib/tcc\"")
"-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"")
"-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out "/lib:{B}/lib:.\"") "-D" (string-append "CONFIG_TCC_CRTPREFIX=\"" out
"/lib:{B}/lib:.\"")
"-D" (string-append "CONFIG_TCC_ELFINTERP=\"" interpreter "\"") "-D" (string-append "CONFIG_TCC_ELFINTERP=\"" interpreter "\"")
"-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc "/lib:{B}/lib:.\"") "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc "/lib:{B}/lib:.\"")
"-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\"" tcc "/include" ":/include:{B}/include\"") "-D" (string-append "CONFIG_TCC_SYSINCLUDEPATHS=\"" tcc "/include" ":/include:{B}/include\"")
@ -372,10 +375,9 @@ (define tcc-boot
(copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a")) (copy-file "libtcc1.a" (string-append out "/lib/libtcc1.a"))
(delete-file (string-append out "/lib/tcc/libtcc1.a")) (delete-file (string-append out "/lib/tcc/libtcc1.a"))
(copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a")) (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a"))
#t))))))))) #t))))))))
(define make-mesboot0 (define make-mesboot0
(package-with-bootstrap-guile
(package (package
(inherit gnu-make) (inherit gnu-make)
(name "make-mesboot0") (name "make-mesboot0")
@ -420,10 +422,9 @@ (define make-mesboot0
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
(install-file "make" bin) (install-file "make" bin)
#t))))))))) #t))))))))
(define diffutils-mesboot (define diffutils-mesboot
(package-with-bootstrap-guile
(package (package
(inherit diffutils) (inherit diffutils)
(name "diffutils-mesboot") (name "diffutils-mesboot")
@ -465,22 +466,22 @@ (define diffutils-mesboot
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile.in" (substitute* "Makefile.in"
(("PROGRAMS = .*" all) "PROGRAMS = cmp diff")) (("PROGRAMS = .*" all) "PROGRAMS = cmp diff"))
#t)))))))) #t)))))))
(define binutils-mesboot0 (define binutils-mesboot0
(package-with-bootstrap-guile
(package (package
(inherit binutils) (inherit binutils)
(name "binutils-mesboot0") (name "binutils-mesboot0")
(version "2.20.1a") (version "2.20.1a")
(source (origin (source (bootstrap-origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/binutils/binutils-" (uri (string-append "mirror://gnu/binutils/binutils-"
version ".tar.bz2")) version ".tar.bz2"))
(patches (search-patches "binutils-boot-2.20.1a.patch")) (patches (search-patches "binutils-boot-2.20.1a.patch"))
(sha256 (sha256
(base32 (base32
"0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi")))) "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi")))))
(inputs '()) (inputs '())
(propagated-inputs '()) (propagated-inputs '())
(native-inputs `(("tcc" ,tcc-boot) (native-inputs `(("tcc" ,tcc-boot)
@ -511,7 +512,7 @@ (define binutils-mesboot0
"--disable-werror" "--disable-werror"
"--build=i686-unknown-linux-gnu" "--build=i686-unknown-linux-gnu"
"--host=i686-unknown-linux-gnu" "--host=i686-unknown-linux-gnu"
"--with-sysroot=/"))))))) "--with-sysroot=/"))))))
(define gcc-core-mesboot (define gcc-core-mesboot
;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C ;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C
@ -519,12 +520,12 @@ (define gcc-core-mesboot
;; library, such as dir.h/struct DIR/readdir, locales, signals... Also, ;; library, such as dir.h/struct DIR/readdir, locales, signals... Also,
;; with gcc-2.95.3, binutils-boot-2.20.1a and glibc-2.2.5 we found a GNU ;; with gcc-2.95.3, binutils-boot-2.20.1a and glibc-2.2.5 we found a GNU
;; toolchain triplet "that works". ;; toolchain triplet "that works".
(package-with-bootstrap-guile
(package (package
(inherit gcc) (inherit gcc)
(name "gcc-core-mesboot") (name "gcc-core-mesboot")
(version "2.95.3") (version "2.95.3")
(source (origin (source (bootstrap-origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-" (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
version version
@ -532,7 +533,7 @@ (define gcc-core-mesboot
(patches (search-patches "gcc-boot-2.95.3.patch")) (patches (search-patches "gcc-boot-2.95.3.patch"))
(sha256 (sha256
(base32 (base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an")))) "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an")))))
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(inputs '()) (inputs '())
(propagated-inputs '()) (propagated-inputs '())
@ -638,10 +639,9 @@ (define gcc-core-mesboot
(files '("include" "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"))) (files '("include" "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include")))
(search-path-specification (search-path-specification
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("lib")))))))) (files '("lib")))))))
(define mesboot-headers (define mesboot-headers
(package-with-bootstrap-guile
(package (package
(inherit mes-boot) (inherit mes-boot)
(name "mesboot-headers") (name "mesboot-headers")
@ -676,18 +676,18 @@ (define mesboot-headers
;; the typical /usr/include headers on an FHS system. ;; the typical /usr/include headers on an FHS system.
(list (search-path-specification (list (search-path-specification
(variable "C_INCLUDE_PATH") (variable "C_INCLUDE_PATH")
(files '("include")))))))) (files '("include")))))))
(define glibc-mesboot0 (define glibc-mesboot0
;; GNU C Library 2.2.5 is the most recent glibc that we managed to build ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build
;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer ;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer
;; gcc. ;; gcc.
(package-with-bootstrap-guile
(package (package
(inherit glibc) (inherit glibc)
(name "glibc-mesboot0") (name "glibc-mesboot0")
(version "2.2.5") (version "2.2.5")
(source (origin (source (bootstrap-origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/glibc/glibc-" (uri (string-append "mirror://gnu/glibc/glibc-"
version version
@ -695,7 +695,7 @@ (define glibc-mesboot0
(patches (search-patches "glibc-boot-2.2.5.patch")) (patches (search-patches "glibc-boot-2.2.5.patch"))
(sha256 (sha256
(base32 (base32
"1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))) "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q")))))
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(inputs '()) (inputs '())
(propagated-inputs '()) (propagated-inputs '())
@ -773,10 +773,9 @@ (define glibc-mesboot0
(files '("include"))) (files '("include")))
(search-path-specification (search-path-specification
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("lib")))))))) (files '("lib")))))))
(define gcc-mesboot0 (define gcc-mesboot0
(package-with-bootstrap-guile
(package (package
(inherit gcc-core-mesboot) (inherit gcc-core-mesboot)
(name "gcc-mesboot0") (name "gcc-mesboot0")
@ -841,10 +840,9 @@ (define gcc-mesboot0
`(let ((gcc (assoc-ref %build-inputs "gcc"))) `(let ((gcc (assoc-ref %build-inputs "gcc")))
`("RANLIB=true" `("RANLIB=true"
,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include") ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include")
"LANGUAGES=c")))))))) "LANGUAGES=c")))))))
(define binutils-mesboot (define binutils-mesboot
(package-with-bootstrap-guile
(package (package
(inherit binutils-mesboot0) (inherit binutils-mesboot0)
(name "binutils-mesboot") (name "binutils-mesboot")
@ -865,10 +863,9 @@ (define binutils-mesboot
"--disable-werror" "--disable-werror"
"--build=i686-unknown-linux-gnu" "--build=i686-unknown-linux-gnu"
"--host=i686-unknown-linux-gnu" "--host=i686-unknown-linux-gnu"
"--with-sysroot=/"))))))) "--with-sysroot=/"))))))
(define make-mesboot (define make-mesboot
(package-with-bootstrap-guile
(package (package
(inherit make-mesboot0) (inherit make-mesboot0)
(name "make-mesboot") (name "make-mesboot")
@ -899,7 +896,7 @@ (define make-mesboot
(add-before 'configure 'setenv (add-before 'configure 'setenv
(lambda _ (lambda _
(setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv") (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv")
#t))))))))) #t))))))))
(define gmp-boot (define gmp-boot
(package (package
@ -936,13 +933,13 @@ (define mpc-boot
"1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1")))))) "1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1"))))))
(define gcc-mesboot1 (define gcc-mesboot1
(package-with-bootstrap-guile
(package (package
(inherit gcc-mesboot0) (inherit gcc-mesboot0)
(name "gcc-mesboot1") (name "gcc-mesboot1")
(version "4.7.4") (version "4.7.4")
(source (origin (inherit (package-source gcc-4.7)) (source (bootstrap-origin
(patches (search-patches "gcc-boot-4.7.4.patch")))) (origin (inherit (package-source gcc-4.7))
(patches (search-patches "gcc-boot-4.7.4.patch")))))
(inputs `(("gmp-source" ,(package-source gmp-boot)) (inputs `(("gmp-source" ,(package-source gmp-boot))
("mpfr-source" ,(package-source mpfr-boot)) ("mpfr-source" ,(package-source mpfr-boot))
("mpc-source" ,(package-source mpc-boot)))) ("mpc-source" ,(package-source mpc-boot))))
@ -1051,13 +1048,12 @@ (define gcc-mesboot1
"--disable-libstdcxx-pch" "--disable-libstdcxx-pch"
;; for libcpp ... ;; for libcpp ...
"--disable-build-with-cxx")))))))) "--disable-build-with-cxx")))))))
(define gcc-mesboot1-wrapper (define gcc-mesboot1-wrapper
;; We need this so gcc-mesboot1 can be used to create shared binaries that ;; We need this so gcc-mesboot1 can be used to create shared binaries that
;; have the correct interpreter, otherwise configuring gcc-mesboot using ;; have the correct interpreter, otherwise configuring gcc-mesboot using
;; --enable-shared will fail. ;; --enable-shared will fail.
(package-with-bootstrap-guile
(package (package
(inherit gcc-mesboot1) (inherit gcc-mesboot1)
(name "gcc-mesboot1-wrapper") (name "gcc-mesboot1-wrapper")
@ -1109,15 +1105,15 @@ (define gcc-mesboot1-wrapper
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(program (string-append bin "/gcc"))) (program (string-append bin "/gcc")))
(invoke program "--help")))))))))) (invoke program "--help")))))))))
(define glibc-headers-mesboot (define glibc-headers-mesboot
(package-with-bootstrap-guile
(package (package
(inherit glibc-mesboot0) (inherit glibc-mesboot0)
(name "glibc-headers-mesboot") (name "glibc-headers-mesboot")
(version "2.16.0") (version "2.16.0")
(source (origin (source (bootstrap-origin
(origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/glibc/glibc-" (uri (string-append "mirror://gnu/glibc/glibc-"
version version
@ -1126,7 +1122,7 @@ (define glibc-headers-mesboot
"glibc-bootstrap-system-2.16.0.patch")) "glibc-bootstrap-system-2.16.0.patch"))
(sha256 (sha256
(base32 (base32
"0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7")))) "0vlz4x6cgz7h54qq4528q526qlhnsjzbsvgc4iizn76cb0bfanx7")))))
(native-inputs `(("binutils" ,binutils-mesboot) (native-inputs `(("binutils" ,binutils-mesboot)
("libc" ,glibc-mesboot0) ("libc" ,glibc-mesboot0)
("gcc" ,gcc-mesboot1) ("gcc" ,gcc-mesboot1)
@ -1214,10 +1210,9 @@ (define glibc-headers-mesboot
(substitute* "../Makeconfig" (substitute* "../Makeconfig"
(("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL")))) (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL"))))
(substitute* "../elf/Makefile" (substitute* "../elf/Makefile"
(("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL"))))))))))))) (("^SHELL := /bin/sh") (string-append "SHELL := " (getenv "CONFIG_SHELL"))))))))))))
(define glibc-mesboot (define glibc-mesboot
(package-with-bootstrap-guile
(package (package
(inherit glibc-headers-mesboot) (inherit glibc-headers-mesboot)
(name "glibc-mesboot") (name "glibc-mesboot")
@ -1262,15 +1257,14 @@ (define glibc-mesboot
(files '("include"))) (files '("include")))
(search-path-specification (search-path-specification
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("lib")))))))) (files '("lib")))))))
(define gcc-mesboot (define gcc-mesboot
(package-with-bootstrap-guile
(package (package
(inherit gcc-mesboot1) (inherit gcc-mesboot1)
(name "gcc-mesboot") (name "gcc-mesboot")
(version "4.9.4") (version "4.9.4")
(source (package-source gcc-4.9)) (source (bootstrap-origin (package-source gcc-4.9)))
(native-inputs `(("binutils" ,binutils-mesboot) (native-inputs `(("binutils" ,binutils-mesboot)
("gcc-wrapper" ,gcc-mesboot1-wrapper) ("gcc-wrapper" ,gcc-mesboot1-wrapper)
("gcc" ,gcc-mesboot1) ("gcc" ,gcc-mesboot1)
@ -1349,12 +1343,11 @@ (define gcc-mesboot
(format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH")) (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH"))
(format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH")) (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH"))
(format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH")) (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH"))
#t))))))))))) #t))))))))))
(define gcc-mesboot-wrapper (define gcc-mesboot-wrapper
;; We need this so gcc-mesboot can be used to create shared binaries that ;; We need this so gcc-mesboot can be used to create shared binaries that
;; have the correct interpreter and runpath to libc. ;; have the correct interpreter and runpath to libc.
(package-with-bootstrap-guile
(package (package
(inherit gcc-mesboot1-wrapper) (inherit gcc-mesboot1-wrapper)
(name "gcc-mesboot-wrapper") (name "gcc-mesboot-wrapper")
@ -1363,10 +1356,9 @@ (define gcc-mesboot-wrapper
(inputs '()) (inputs '())
(native-inputs `(("bash" ,%bootstrap-coreutils&co) (native-inputs `(("bash" ,%bootstrap-coreutils&co)
("libc" ,glibc-mesboot) ("libc" ,glibc-mesboot)
("gcc" ,gcc-mesboot)))))) ("gcc" ,gcc-mesboot)))))
(define m4-mesboot (define m4-mesboot
(package-with-bootstrap-guile
(package (package
(inherit m4) (inherit m4)
(name "m4-mesboot") (name "m4-mesboot")
@ -1392,7 +1384,7 @@ (define m4-mesboot
"/bin/sh")) "/bin/sh"))
(setenv "CC" "tcc -static") (setenv "CC" "tcc -static")
(setenv "CPP" "tcc -E") (setenv "CPP" "tcc -E")
(invoke "./configure" (string-append "--prefix=" out))))))))))) (invoke "./configure" (string-append "--prefix=" out))))))))))
(define (%bootstrap-inputs+toolchain) (define (%bootstrap-inputs+toolchain)
;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed ;; The traditional bootstrap-inputs. For the i686-linux Reduced Binary Seed
@ -1409,8 +1401,9 @@ (define (%bootstrap-inputs+toolchain)
(%bootstrap-inputs)))) (%bootstrap-inputs))))
(define gnu-make-boot0 (define gnu-make-boot0
(package-with-bootstrap-guile (package
(package (inherit gnu-make) (inherit gnu-make)
(source (bootstrap-origin (package-source gnu-make)))
(name "make-boot0") (name "make-boot0")
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -1429,7 +1422,7 @@ (define gnu-make-boot0
(install-file "make" bin) (install-file "make" bin)
#t)))))))) #t))))))))
(native-inputs '()) ; no need for 'pkg-config' (native-inputs '()) ; no need for 'pkg-config'
(inputs (%bootstrap-inputs+toolchain))))) (inputs (%bootstrap-inputs+toolchain))))
(define diffutils-boot0 (define diffutils-boot0
(package-with-bootstrap-guile (package-with-bootstrap-guile