[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/58: gnu: commencement: binutils-mesboot: Use Gash instead of coreutil
From: |
guix-commits |
Subject: |
35/58: gnu: commencement: binutils-mesboot: Use Gash instead of coreutils&co. |
Date: |
Thu, 6 Feb 2020 17:52:21 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 474aa746e9f4cb9fb999716c0e97cec17b3ecb1f
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Fri Nov 22 22:00:58 2019 +0100
gnu: commencement: binutils-mesboot: Use Gash instead of coreutils&co.
* gnu/packages/commencement.scm (binutils-mesboot): Use Gash instead of
coreutils&co.
* gnu/packages/commencement.scm (%boot-mesboot3-inputs): New variable.
---
gnu/packages/commencement.scm | 88 ++++++++++++++++++++++++++++++++++---------
1 file changed, 70 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5695ba2..640244a 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2247,26 +2247,73 @@ ac_cv_c_float_format='IEEE (little-endian)'
(define binutils-mesboot
(package
- (inherit binutils-mesboot0)
+ (inherit binutils)
(name "binutils-mesboot")
- (native-inputs `(("binutils" ,binutils-mesboot0)
- ("libc" ,glibc-mesboot0)
- ("gcc" ,gcc-mesboot0)
-
- ("bash" ,%bootstrap-coreutils&co)
- ("coreutils" ,%bootstrap-coreutils&co)
- ("diffutils" ,diffutils-mesboot)
- ("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-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")))))
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs `(("xz" ,xz-mesboot)
+ ,@(%boot-mesboot2-inputs)))
+ (supported-systems '("i686-linux" "x86_64-linux"))
(arguments
- (substitute-keyword-arguments (package-arguments binutils-mesboot0)
- ((#:configure-flags configure-flags)
- '(list "--disable-nls"
- "--disable-shared"
- "--disable-werror"
- "--build=i686-unknown-linux-gnu"
- "--host=i686-unknown-linux-gnu"
- "--with-sysroot=/"))))))
+ `(#:implicit-inputs? #f
+ #:guile ,%bootstrap-guile
+ #:tests? #f ; runtest: command not found
+ #:parallel-build? #f
+ #:strip-binaries? #f ; no strip yet
+ #:configure-flags
+ `("CC=gcc"
+ "CXX=false"
+ "RANLIB=true"
+ "--disable-doc"
+ "--disable-nls"
+ "--disable-shared"
+ "--disable-werror"
+ "--build=i686-unknown-linux-gnu"
+ "--host=i686-unknown-linux-gnu"
+ "--with-sysroot=/"
+ ;; checking for grep that handles long lines and -e
+ "ac_cv_path_GREP=grep")
+ ;; FIXME: ac_cv_path_GREP=grep doesn't seem to be forwarded to
+ ;; cascading configure's?
+ #:make-flags '("ac_cv_path_GREP=grep")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'scripted-patch
+ (lambda _
+ ;; sed-mesboot0 cannot build these
+ (copy-file "binutils/Makefile.in" "binutils/Makefile.in.orig")
+ (substitute* "binutils/Makefile.in"
+ ;; binutils/binutils uses an amazingly complex install
+ ;; command, using FOR, SED, READ, IF, ECHO, SED, SED, AWK,
+ ;; READ, and then LIBTOOL (to do something like
+ ;; `mkdir $DESTDIR$bindir; cp readline $DESTDIR$bindir ...')
+
+ ;; Some tool [debugme!] cannot handle two escaped newlines
+ ;; (bash?), and the install stops after $(am__EXEEXT_11)
+ ;; ("objcopy"), so $(am__EXEEXT_13) ("readelf") and others do
+ ;; not get installed. Remove the stray newline:
+ (("^\t@BUILD_NLMCONV@ @BUILD_SRCONV@ @BUILD_DLLTOOL@
@BUILD_WINDRES@ .*") ""))
+ (substitute* "opcodes/Makefile.in"
+ (("^SUBDIRS = [.] po") "SUBDIRS = ."))
+ (substitute* "binutils/Makefile.in"
+ (("^SUBDIRS = doc po") "SUBDIRS ="))
+ (substitute* "gas/Makefile.in"
+ (("^SUBDIRS = doc po") "SUBDIRS ="))
+ (substitute* "gprof/Makefile.in"
+ (("^SUBDIRS = po") "SUBDIRS ="))
+ (substitute* "ld/Makefile.in"
+ (("^SUBDIRS = po") "SUBDIRS ="))
+ #t)))))))
(define gcc-mesboot1-wrapper
;; We need this so gcc-mesboot1 can be used to create shared binaries that
@@ -2325,6 +2372,11 @@ exec " gcc "/bin/" program
(program (string-append bin "/gcc")))
(invoke program "--help")))))))))
+(define (%boot-mesboot3-inputs)
+ `(("binutils" ,binutils-mesboot)
+ ("xz" ,xz-mesboot)
+ ,@(alist-delete "binutils" (%boot-mesboot2-inputs))))
+
(define glibc-headers-mesboot
(package
(inherit glibc-mesboot0)
- 12/58: gnu: commencement: Add bash-mesboot0., (continued)
- 12/58: gnu: commencement: Add bash-mesboot0., guix-commits, 2020/02/06
- 19/58: gnu: commencement: Add gawk-mesboot0., guix-commits, 2020/02/06
- 07/58: gnu: commencement: mes-boot: Use Gash instead of coretutils&co., guix-commits, 2020/02/06
- 40/58: gnu: commencement: gcc-mesboot-wrapper: Use Gash instead of coreutils&co., guix-commits, 2020/02/06
- 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 <=
- 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, 2020/02/06
- 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