[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/58: gnu: commencement: binutils-mesboot0: Use Gash instead of coretut
From: |
guix-commits |
Subject: |
17/58: gnu: commencement: binutils-mesboot0: Use Gash instead of coretutils&co. |
Date: |
Thu, 6 Feb 2020 17:52:15 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 0f6adf41da37fee09cfb1df99cd6aa8cbd843ca7
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sun Oct 6 15:22:01 2019 +0200
gnu: commencement: binutils-mesboot0: Use Gash instead of coretutils&co.
* gnu/packages/commencement.scm (binutils-mesboot0): Use Gash instead of
coretutils&co; downgrade to 2.14.0.
---
gnu/packages/commencement.scm | 77 ++++++++++++++++++++++++++-----------------
1 file changed, 46 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 2fc2f06..a9cb499 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1187,50 +1187,65 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
,@(alist-delete "tcc" (%boot-tcc0-inputs))))
(define binutils-mesboot0
+ ;; The initial Binutils
(package
(inherit binutils)
(name "binutils-mesboot0")
- (version "2.20.1a")
- (source (bootstrap-origin
- (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/binutils/binutils-"
- version ".tar.bz2"))
- (patches (search-patches "binutils-boot-2.20.1a.patch"))
- (sha256
- (base32
- "0r7dr0brfpchh5ic0z9r4yxqn4ybzmlh25sbp30cacqk8nb7rlvi")))))
+ (version "2.14")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/binutils/binutils-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1w8xp7k44bkijr974x9918i4p1sw4g2fcd5mxvspkjpg38m214ds"))))
(inputs '())
(propagated-inputs '())
- (native-inputs `(("tcc" ,tcc-boot)
-
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("diffutils" ,diffutils-mesboot)
- ("make" ,make-mesboot0)))
+ (native-inputs (%boot-tcc-inputs))
(supported-systems '("i686-linux" "x86_64-linux"))
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
- #:tests? #f ; runtest: command not found
+ #:tests? #f ; runtest: command not found
#:parallel-build? #f
- #:strip-binaries? #f ; no strip yet
+ #:strip-binaries? #f ; no strip yet
#:configure-flags
- (let ((cppflags (string-append " -D __GLIBC_MINOR__=6"
- " -D MES_BOOTSTRAP=1"))
- (bash (assoc-ref %build-inputs "bash")))
- `(,(string-append "CONFIG_SHELL=" bash "/bin/sh")
- ,(string-append "CPPFLAGS=" cppflags)
- "AR=tcc -ar"
- "CXX=false"
- "RANLIB=true"
- ,(string-append "CC=tcc" cppflags)
- "--disable-nls"
+ (let ((out (assoc-ref %outputs "out")))
+ `("--disable-nls"
"--disable-shared"
"--disable-werror"
- "--build=i686-unknown-linux-gnu"
- "--host=i686-unknown-linux-gnu"
- "--with-sysroot=/"))))))
+ "--build=i386-unknown-linux"
+ "--host=i386-unknown-linux"
+ "--target=i386-unknown-linux"
+ "--with-sysroot=/"
+ ,(string-append "--prefix=" out)))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'setenv
+ (lambda _
+ (let* ((out (assoc-ref %outputs "out"))
+ (bash (assoc-ref %build-inputs "bash"))
+ (shell (string-append bash "/bin/bash")))
+ (setenv "CONFIG_SHELL" shell)
+ (setenv "SHELL" shell)
+ (setenv "AR" "tcc -ar")
+ (setenv "RANLIB" "true")
+ (setenv "CC" "tcc -D __GLIBC_MINOR__=6")
+ #t)))
+ (add-after 'unpack 'scripted-patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "bfd/configure"
+ (("^sed -e '/SRC-POTFILES.*" all)
+ "echo -e 'all:\\n\\ttrue\\n\\ninstall:\\n\\ttrue\\n' >
po/Makefile\n"))
+ #t))
+ (replace 'configure ; needs classic invocation of configure
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ (format (current-error-port)
+ "running ./configure ~a\n" (string-join configure-flags))
+ (apply system* "./configure" configure-flags)
+ (substitute* "config.status"
+ (("[.]//dev/null") "/dev/null"))
+ (invoke "sh" "./config.status"))))))))
(define gcc-core-mesboot
;; Gcc-2.95.3 is the most recent GCC that is supported by what the Mes C
- 39/58: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co., (continued)
- 39/58: gnu: commencement: gcc-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 49/58: gnu: commencement: Add coreutils-boot0., guix-commits, 2020/02/06
- 27/58: gnu: commencement: Add make-mesboot., guix-commits, 2020/02/06
- 13/58: gnu: commencement: tcc-boot: Use Gash instead of coretutils&co., guix-commits, 2020/02/06
- 14/58: gnu: commencement: diffutils-mesboot: Use Gash instead of coretutils&co., guix-commits, 2020/02/06
- 22/58: gnu: commencement: gcc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/06
- 35/58: gnu: commencement: binutils-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 41/58: gnu: commencement: Add coreutils-mesboot., guix-commits, 2020/02/06
- 53/58: gnu: commencement: gnu-make-mesboot0: Rename from make-mesboot0., guix-commits, 2020/02/06
- 57/58: gnu: commencement: mes-boot: Update to 0.22., guix-commits, 2020/02/06
- 17/58: gnu: commencement: binutils-mesboot0: Use Gash instead of coretutils&co.,
guix-commits <=
- 23/58: gnu: commencement: Add tar-mesboot., guix-commits, 2020/02/06
- 26/58: gnu: commencement: Add coreutils-mesboot0., guix-commits, 2020/02/06
- 25/58: gnu: commencement: Add binutils-mesboot1., guix-commits, 2020/02/06
- 15/58: gnu: commencement: Add patch-mesboot., guix-commits, 2020/02/06
- 21/58: gnu: commencement: glibc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/06
- 51/58: gnu: commencement: %bootstrap-tarballs: Remove %bootstrap-binaries-tarball., guix-commits, 2020/02/06
- 44/58: gnu: commencement: Add gawk-boot0., guix-commits, 2020/02/06
- 31/58: gnu: commencement: Add bash-mesboot., guix-commits, 2020/02/06
- 30/58: gnu: commencement: Add gcc-core-mesboot1., guix-commits, 2020/02/06
- 36/58: gnu: commencement: glibc-headers-mesboot: Use Gash instead of coreutils&co., guix-commits, 2020/02/06