[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: checkpoint gcc-core-mesboot1: assert that bash-mesboot0, bash-mes
|
From: |
guix-commits |
|
Subject: |
01/04: checkpoint gcc-core-mesboot1: assert that bash-mesboot0, bash-mesboot are broken |
|
Date: |
Fri, 11 Jan 2019 09:51:03 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 6709fe6b9631b4648e37674a9b1c728939fc801f
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Jan 11 14:57:30 2019 +0100
checkpoint gcc-core-mesboot1: assert that bash-mesboot0, bash-mesboot are
broken
---
gnu/packages/commencement.scm | 313 ++++++++++++++++++++++++++++--------------
1 file changed, 208 insertions(+), 105 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b1250bd..0534357 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -81,6 +81,106 @@
;;;
;;; Code:
+(define bash-seed
+ (package-with-bootstrap-guile
+ (package
+ (inherit bash)
+ (name "bash-seed")
+ (source #f)
+ (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
+ (inputs '())
+ (propagated-inputs '())
+ (outputs '("out"))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:guile ,%bootstrap-guile
+ #:modules ((guix build utils))
+ #:builder (begin
+ (use-modules (guix build utils))
+
+ (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
+ (out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (install-file (string-append coreutils "/bin/bash") bin)
+ (symlink "bash" (string-append bin "/sh"))
+ #t)))))))
+
+(define gawk-seed
+ (package-with-bootstrap-guile
+ (package
+ (inherit gawk)
+ (name "gawk-seed")
+ (source #f)
+ (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
+ (inputs '())
+ (propagated-inputs '())
+ (outputs '("out"))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:guile ,%bootstrap-guile
+ #:modules ((guix build utils))
+ #:builder (begin
+ (use-modules (guix build utils))
+
+ (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
+ (out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (install-file (string-append coreutils "/bin/gawk") bin)
+ (symlink "gawk" (string-append bin "/awk"))
+ #t)))))))
+
+(define grep-seed
+ (package-with-bootstrap-guile
+ (package
+ (inherit grep)
+ (name "grep-seed")
+ (source #f)
+ (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
+ (inputs '())
+ (propagated-inputs '())
+ (outputs '("out"))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:guile ,%bootstrap-guile
+ #:modules ((guix build utils))
+ #:builder (begin
+ (use-modules (guix build utils))
+
+ (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
+ (out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (install-file (string-append coreutils "/bin/grep") bin)
+ (install-file (string-append coreutils "/bin/egrep") bin)
+ (install-file (string-append coreutils "/bin/fgrep") bin)
+ #t)))))))
+
+(define sed-seed
+ (package-with-bootstrap-guile
+ (package
+ (inherit sed)
+ (name "sed-seed")
+ (source #f)
+ (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
+ (inputs '())
+ (propagated-inputs '())
+ (outputs '("out"))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:guile ,%bootstrap-guile
+ #:modules ((guix build utils))
+ #:builder (begin
+ (use-modules (guix build utils))
+
+ (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
+ (out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (install-file (string-append coreutils "/bin/sed") bin)
+ #t)))))))
+
(define mes-boot0
(package
(inherit mes)
@@ -1508,6 +1608,83 @@ cp libc-new.a $PREFIX/lib/libc.a
(install-file "sed" bin)
#t)))))))))
+(define-public grep-mesboot0
+ (package-with-bootstrap-guile
+ (package
+ (inherit sed)
+ (name "grep-mesboot0")
+ (version "2.0") ;; 1996
+ ;;(version "2.5") ;; 2004
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/sed/grep-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1hyv7i82jd0q18xcql51ylc8jwadp3gb3irgcqlis3v61p35jsv2"))))
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs `(("bash" ,bash-mesboot0)
+ ("gzip" ,gzip-mesboot0)
+ ("make" ,make-mesboot0)
+ ("tar" ,tar-mesboot0)
+ ("sed" ,sed-mesboot0)
+ ("tcc" ,tcc-boot0)
+
+ ("gash" ,%bootstrap-gash)
+ ("guile" ,%bootstrap-guile)))
+ (arguments
+ `(#:implicit-inputs? #f
+ #:guile ,%bootstrap-guile
+ #:parallel-build? #f
+ #:make-flags '("CC=tcc")
+ #:strip-binaries? #f ; no strip yet
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'unpack 'setenv
+ (lambda _
+ (let ((bash (assoc-ref %build-inputs "bash"))
+ (gash (assoc-ref %build-inputs "gash")))
+ (setenv "PATH" (string-append (getenv "PATH") ":" gash
"/libexec/gash:"))
+ (format #t "PATH=~s\n" (getenv "PATH"))
+ (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
+ (setenv "SHELL" (string-append bash "/bin/sh"))
+ (setenv "CC" "tcc")
+ #t)))
+ (replace 'unpack
+ (lambda* (#:key source #:allow-other-keys)
+ (invoke "tar" "zxvf" source)
+ ;;(chdir (first-subdirectory "."))
+ (chdir (string-append "grep-" ,version))
+ #t))
+ (add-after 'unpack 'patch
+ (lambda _
+ (let* ((out (assoc-ref %outputs "out"))
+ (bash (assoc-ref %build-inputs "bash"))
+ (shell (string-append bash "/bin/bash")))
+ (substitute* "configure"
+ (("/bin/sh") shell))
+ #t)))
+ ;; (add-after 'configure 'fixup-configure
+ ;; (lambda _
+ ;; (substitute* "Makefile"
+ ;; (("HAVE_bcopy") "HAVE_BCOPY")
+ ;; (("HAVE_memcpy") "HAVE_MEMCPY")
+ ;; (("HAVE_string_h") "HAVE_STRING_H"))
+ ;; #t))
+ (replace 'check
+ (lambda _
+ (invoke "./grep" "--version")))
+ (replace 'install
+ (lambda _
+ (let* ((out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (install-file "grep" bin)
+ (install-file "egrep" bin)
+ (install-file "fgrep" bin)
+ #t)))))))))
+
(define-public sed-mesboot1
(package-with-bootstrap-guile
(package
@@ -3109,106 +3286,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1"))))))
-(define-public bash-seed
- (package-with-bootstrap-guile
- (package
- (inherit bash)
- (name "bash-seed")
- (source #f)
- (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
- (inputs '())
- (propagated-inputs '())
- (outputs '("out"))
- (build-system trivial-build-system)
- (arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
- #:builder (begin
- (use-modules (guix build utils))
-
- (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
- (out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin")))
- (mkdir-p bin)
- (install-file (string-append coreutils "/bin/bash") bin)
- (symlink "bash" (string-append bin "/sh"))
- #t)))))))
-
-(define-public gawk-seed
- (package-with-bootstrap-guile
- (package
- (inherit gawk)
- (name "gawk-seed")
- (source #f)
- (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
- (inputs '())
- (propagated-inputs '())
- (outputs '("out"))
- (build-system trivial-build-system)
- (arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
- #:builder (begin
- (use-modules (guix build utils))
-
- (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
- (out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin")))
- (mkdir-p bin)
- (install-file (string-append coreutils "/bin/gawk") bin)
- (symlink "gawk" (string-append bin "/awk"))
- #t)))))))
-
-(define-public grep-seed
- (package-with-bootstrap-guile
- (package
- (inherit grep)
- (name "grep-seed")
- (source #f)
- (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
- (inputs '())
- (propagated-inputs '())
- (outputs '("out"))
- (build-system trivial-build-system)
- (arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
- #:builder (begin
- (use-modules (guix build utils))
-
- (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
- (out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin")))
- (mkdir-p bin)
- (install-file (string-append coreutils "/bin/grep") bin)
- (install-file (string-append coreutils "/bin/egrep") bin)
- (install-file (string-append coreutils "/bin/fgrep") bin)
- #t)))))))
-
-(define-public sed-seed
- (package-with-bootstrap-guile
- (package
- (inherit sed)
- (name "sed-seed")
- (source #f)
- (native-inputs `(("coreutils" ,%bootstrap-coreutils&co)))
- (inputs '())
- (propagated-inputs '())
- (outputs '("out"))
- (build-system trivial-build-system)
- (arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
- #:builder (begin
- (use-modules (guix build utils))
-
- (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
- (out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin")))
- (mkdir-p bin)
- (install-file (string-append coreutils "/bin/sed") bin)
- #t)))))))
-
(define-public gcc-core-mesboot1
(package-with-bootstrap-guile
(package
@@ -3232,33 +3309,59 @@ ac_cv_c_float_format='IEEE (little-endian)'
(inputs `(("gmp-source" ,(package-source gmp-boot))
("mpfr-source" ,(package-source mpfr-boot))
("mpc-source" ,(package-source mpc-boot))))
- (native-inputs `(;;("boot-patch" ,(search-patch "gcc-boot-4.7.4.patch"))
+ (native-inputs `( ;;("boot-patch" ,(search-patch "gcc-boot-4.7.4.patch"))
("boot-patch" ,(search-patch "gcc-boot-4.6.4.patch"))
;; hack -- which tool is broken?
- ;;("coreutils" ,%bootstrap-coreutils&co)
+ ;; Unless using %bootstrap-coreutils&co, or
+ ;; all seeds: bash-seed, gawk-seed, grep-seed, sed-seed
+ ;; we get configure/build errors like these:
+
+ ;; Makefile:520: *** missing separator. Stop.
+ ;; #### host and target specific makefile fragments come
in here.
+ ;; @target_makefile_frag@
+ ;; @alphaieee_frag@
+ ;; @ospace_frag@
+ ;; @host_makefile_frag@
+ ;; ###
+
+ ;; gawk: ./conf1444-14670/subs.awk:8: S["LTLIBOBJS"]=
+ ;; gawk: ./conf1444-14670/subs.awk:8: ^
unexpected newline or end of string
+ ;; config.status: error: could not create Makefile
+
+ ;; This error is caused by using either bash-mesboot0 or
+ ;; bash-mesboot instead of bash-seed:
+
+ ;;./libtool: line 1: tr: command not found
+ ;; ("bash" ,bash-mesboot)
+ ;; ("bash" ,bash-mesboot0)
+
("bash" ,bash-seed)
("gawk" ,gawk-seed)
("grep" ,grep-seed)
("sed" ,sed-seed)
- ;;./libtool: line 1: tr: command not found
- ;; ("bash" ,bash-mesboot)
+ ;; both broken
+ ("bash" ,bash-mesboot)
("bash" ,bash-mesboot0)
- ;;("binutils" ,binutils-mesboot1)
+ ;; not necessary ("binutils" ,binutils-mesboot1)
("binutils" ,binutils-mesboot0)
("coreutils" ,coreutils-mesboot)
("diffutils" ,diffutils-mesboot0)
+
("gawk" ,gawk-mesboot1)
("gawk" ,gawk-mesboot0)
+
("gcc" ,gcc-mesboot0)
("gzip" ,gzip-mesboot0)
("libc" ,glibc-mesboot0)
("make" ,make-mesboot)
("patch" ,patch-mesboot0)
+
("sed" ,sed-mesboot1)
("sed" ,sed-mesboot0)
+
("tar" ,tar-mesboot2)
("gash" ,%bootstrap-gash) ; for grep
- branch wip-bootstrap updated (5951620 -> f616091), guix-commits, 2019/01/11
- 04/04: checkpoint gcc-core-mesboot1: remove sed-seed, sed-mesboot0 is fine., guix-commits, 2019/01/11
- 02/04: checkpoint gcc-core-mesboot1: remove gawk-seed, gawk-mesboot0 is fine., guix-commits, 2019/01/11
- 03/04: checkpoint gcc-core-mesboot1: remove grep-seed, gash grep is fine., guix-commits, 2019/01/11
- 01/04: checkpoint gcc-core-mesboot1: assert that bash-mesboot0, bash-mesboot are broken,
guix-commits <=