85/163: gnu: mes-boot: Update for linux-4.17 elf32-header fix.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit a69f7c9bf4c7dbefa322cd9809c7e4a9534730b4
Author: Jan Nieuwenhuizen
Date: Sat Jun 16 09:25:45 2018 +0200
gnu: mes-boot: Update for linux-4.17 elf32-header fix.
* gnu/packages/mes.scm (mes-boot): Update for linux-4.17 elf32-header fix.
---
gnu/packages/mes.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 55d5242..327fecb 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -230,8 +230,8 @@ hex2 linker.")
(define-public mes-boot
(let ((version "0.15")
-(revision "0")
-(commit "04a4a8dd9fbf4c049cfc284012d718e2d4fdbbbe"))
+(revision "1")
+(commit "f0db60dce8dc368b4836771c8c32988bee0121ce"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -244,7 +244,7 @@ hex2 linker.")
"/mes-" commit ".tar.gz"))
(sha256
(base32
- "1c7h1nlv8glnkaxlavf2z0c93d9whxf82ifvfap3jdr7jjjmy2np"
+ "0vpg8c129x5d30ckcfjy5rjhkbdgrdfgxjbq8r55qy9qh19hzw4m"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
15/163: gnu: tcc-boot: Use bootstrap Guile and simplify.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 586692f3ef4c959b9a25e645136d1aed5325b394
Author: Ricardo Wurmus
Date: Sun Nov 26 13:19:28 2017 +0100
gnu: tcc-boot: Use bootstrap Guile and simplify.
* gnu/packages/mes.scm (tcc-boot): Simplify; use %bootstrap-guile and
package-with-bootstrap-guile.
---
gnu/packages/mes.scm | 209 +--
1 file changed, 102 insertions(+), 107 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 5bb3c34..3c1b96f 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -332,119 +332,114 @@ extensive examples, including parsers for the
Javascript and C99 languages.")
(let ((version "0.9.26")
(revision "0")
(commit "8f495f27423acbf569459f517466a07ed2c96c45"))
-(package
- (name "tcc-boot")
- (version (string-append version "-" revision "." (string-take commit 7)))
- (synopsis "Tiny and fast C compiler")
- (source (origin
-(method url-fetch)
-(uri (string-append "https://gitlab.com/janneke/tinycc;
-
-"/repository/archive.tar.gz?ref="
-commit))
-(file-name (string-append name "-" version ".tar.xz"))
-(sha256
- (base32
- "15kh9qpc12pph0yz1rz8v646kx9x62a1cqgy0g0y4vbj3sampdsy"
- (build-system trivial-build-system)
- (supported-systems '("i686-linux" "x86_64-linux"))
- (native-inputs
- `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
- ("guile" ,(origin (method url-fetch)
- (uri ((@@ (gnu packages package-management)
boot-guile-uri) "x86_64"))
- (sha256
-(base32
-
"1w2p5zyrglzzniqgvyn1b55vprfzhgk8vzbzkkbdgl5248si0yq3"
- ;; guile-2.0.9 does not have srfi-43; cherry-pick
- ("srfi-43" ,(origin
- (method url-fetch)
- (uri
"http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0;)
- (file-name "srfi-43.scm")
- (sha256
-(base32
-
"0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb"
- ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
- ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
- ("mes" ,mes-boot)
- ("mescc-tools" ,mescc-tools-boot)
- ("nyacc-source" ,(package-source nyacc-boot))
- ("tinycc-seed"
- ,(origin
- (method url-fetch)
- (uri (string-append "https://gitlab.com/janneke/tinycc-seed;
- "/repository/archive.tar.gz?ref="
- "393a3117a91ec057494986bd75215e1a1786d69d"))
- (file-name (string-append name "-seed" "-" version ".tar.xz"))
- (sha256
- (base32
- "0ipb59my9hxkaybvj8bss5chqs2ypga3k765l93z374p57cqmllm"))
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "static-bash"))
- (mes (assoc-ref %build-inputs "mes"))
- (guile (assoc-ref %build-inputs "guile"))
- (srfi-43 (assoc-ref %build-inputs "srfi-43"))
- (mescc-tools (assoc-ref %build-inputs "mescc-tools"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
- (source (assoc-ref %build-inputs "source"))
- (nyacc-source (assoc-ref %build-inputs "nyacc-source"))
- (tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))
- (out (assoc-ref %outputs "out"))
- (out/bin (string-append out "/bin"))
- (interpreter "interpreter")
- (dir (getcwd)))
- (setenv "PATH" (string-append bash "/bin:"
- mes "/bin:"
- "../guile/bin:"
- mescc-tools "/bin:"
- tar "/bin:"
- xz "/bin"))
- (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
- (mkdir-p "source")
- (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
- (mkdir-p "guile")
- (system* "tar" "-C" "guile" "-xvf" guile)
- (mkdir-p "nyacc-source")
- (system* "tar" "--strip=1" "-C" "nyacc-source" "-xvf"
nyacc-source)
- (mkdir-p "tinycc-seed")
-
56/163: gnu: mescc-tools-boot: Update for mes 0.15.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 32e0c6f6aad805f172f2ba65418e32b5a33a0077
Author: Jan Nieuwenhuizen
Date: Wed May 30 18:15:12 2018 +0200
gnu: mescc-tools-boot: Update for mes 0.15.
* gnu/packages/mes.scm (mescc-tools-boot): Update for mes 0.15.
---
gnu/packages/mes.scm | 130 ++-
1 file changed, 66 insertions(+), 64 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 650469a..32e52ba 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -153,72 +153,74 @@ with a Knight VM that runs Forth and Lisp.")
(license gpl3+
(define-public mescc-tools-boot
- (package-with-bootstrap-guile
- (package
- (name "mescc-tools-boot")
- (version "0.4")
- (synopsis "Tools for the full source bootstrapping process")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/oriansj/mescc-tools/archive/Release_;
- version
- ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
-(base32
- "1iwc8xqwzdaqckb4jkkisljrgn8ii4bl7dzk1l2kpv98hsyq9vi1"
- (native-inputs
- `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
-("bash" ,(search-bootstrap-binary "bash" (%current-system)))
-("tar" ,(search-bootstrap-binary "tar" (%current-system)))
-("xz" ,(search-bootstrap-binary "xz" (%current-system)))
-("mescc-tools-seed" ,%mescc-tools-seed)
-("mes-source" ,(package-source mes-boot))
-("mes-seed" ,%mes-seed)))
- (supported-systems '("i686-linux" "x86_64-linux"))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
-#:builder
-(begin
- (use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "static-bash"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
- (source (assoc-ref %build-inputs "source"))
- (mescc-tools-seed (assoc-ref %build-inputs
"mescc-tools-seed"))
- (mes-seed (assoc-ref %build-inputs "mes-seed"))
- (mes-source (assoc-ref %build-inputs "mes-source"))
- (out (assoc-ref %outputs "out"))
- (out/bin (string-append out "/bin")))
-(setenv "PATH" (string-append bash "/bin:"
- "../mescc-tools-seed:"
- tar "/bin:"
- xz "/bin"))
-(format (current-error-port) "PATH=~s\n" (getenv "PATH"))
-(mkdir-p "source")
-(system* "tar" "--strip=1" "-C" "source" "-xvf" source)
-(mkdir-p "mescc-tools-seed")
-(system* "tar" "--strip=1" "-C" "mescc-tools-seed" "-xvf"
mescc-tools-seed)
-(mkdir-p "mes-source")
-(system* "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source)
-(mkdir-p "mes-seed")
-(system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
-(chdir "source")
-(setenv "PREFIX" out)
-(setenv "MES_PREFIX" "../mes-source")
-(setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed")
-(setenv "MES_SEED" "../mes-seed")
-(and (zero? (system* "sh" "build.sh"))
- (zero? (system* "sh" "check.sh"))
- (zero? (system* "sh" "install.sh")))
- (description
- "Mescc-tools is a collection of tools for use in a full source
+ (let ((version "0.4")
+(revision "0")
+(commit "9cbee90b4265d085c751ce2ce63fd8e972148638"))
+(package-with-bootstrap-guile
+ (package
+ (name "mescc-tools-boot")
+ (version (string-append version "-" revision "." (string-take commit
7)))
+ (synopsis "Tools for the full source bootstrapping process")
+ (source (origin
+ (method url
58/163: gnu: mes-boot: Update to 0.15.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f5448ed530d186cb6a669ddadcca919d3ca2887d
Author: Jan Nieuwenhuizen
Date: Mon May 28 19:12:13 2018 +0200
gnu: mes-boot: Update to 0.15.
* gnu/packages/mes.scm (%fake-bootstrap?): New variable.
(mes-boot): If %fake-bootstrap, cheat using Guile to build in ~1min.
Update to 0.15.
---
gnu/packages/mes.scm | 81 ++--
1 file changed, 47 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index f4a496b..2988b7f 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -39,6 +39,8 @@
#:use-module (guix licenses)
#:use-module (guix packages))
+(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up?
+
(define %mescc-tools-seed
(let ((commit"32881b9ff21fb41dc846914753b6cdadd75927c4"))
(origin
@@ -223,9 +225,9 @@ hex2 linker.")
(license gpl3+)
(define-public mes-boot
- (let ((version "0.14")
+ (let ((version "0.15")
(revision "0")
-(commit "4e50490aa2513ced5b568f434b23ba36218ba7b3"))
+(commit "04a4a8dd9fbf4c049cfc284012d718e2d4fdbbbe"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -238,21 +240,21 @@ hex2 linker.")
"/mes-" commit ".tar.gz"))
(sha256
(base32
- "0ydsmkqb0sm1rhh83r0kyqv7664iw1ginvd52gp11mx7317qaldk"
+ "1c7h1nlv8glnkaxlavf2z0c93d9whxf82ifvfap3jdr7jjjmy2np"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
("bash" ,(search-bootstrap-binary "bash" (%current-system)))
- ;; For testing with Guile
- ;; ("guile" ,%bootstrap-guile)
- ;; guile-2.0.9 does not have srfi-43; cherry-pick
- ("srfi-43" ,%srfi-43)
("tar" ,(search-bootstrap-binary "tar" (%current-system)))
("xz" ,(search-bootstrap-binary "xz" (%current-system)))
("mescc-tools" ,mescc-tools-boot)
("nyacc-source" ,(package-source nyacc-boot))
- ("mes-seed" ,%mes-seed)))
+ ("mes-seed" ,%mes-seed)
+ ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile
+`(("guile" ,%bootstrap-guile)
+ ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43;
cherry-pick
+'(
(arguments
`(#:modules ((guix build utils))
#:builder
@@ -269,6 +271,8 @@ hex2 linker.")
(mes-seed (assoc-ref %build-inputs "mes-seed"))
(out (assoc-ref %outputs "out"))
(dir (getcwd)))
+
+ ;; unpack
(setenv "PATH" (string-append
bash "/bin:"
(if guile (string-append guile "/bin:") "")
@@ -282,43 +286,52 @@ hex2 linker.")
(system* "tar" "--strip=1" "-C" "nyacc-source" "-xvf"
nyacc-source)
(mkdir-p "mes-seed")
(system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
- (mkdir-p "srfi")
- (system* "cp" srfi-43 "srfi/srfi-43.scm")
+ (when srfi-43
+(mkdir-p "srfi")
+(system* "cp" srfi-43 "srfi/srfi-43.scm"))
(chdir "source")
;; configure
(setenv "PREFIX" out)
- (when guile
-(setenv "GUILE_AUTO_COMPILE" "1")
-(setenv "GUILE_LOAD_COMPILED_PATH"
-(string-append guile "/lib/guile/2.0/ccache"))
-(setenv "GUILE_LOAD_PATH"
-(string-append "../nyacc-source/module"
- ":" dir
- ":" guile "/share/guile/2.0/")))
-
- ;; guile-2.0 fails
- (delete-file "tests/srfi-43.test-guile")
-
- ;; give auto-compile a home -- massive speed-up
- (mkdir-p "/tmp/home")
- (setenv "HOME" "/tmp/home")
-
- (when (not guile)
43/163: gnu: stage0-boot: Update to new gitlab url scheme.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ddb01158cf1bb1e8cca96eab8a1c92faea17faaa
Author: Jan Nieuwenhuizen
Date: Sat Apr 21 23:07:25 2018 +0200
gnu: stage0-boot: Update to new gitlab url scheme.
* gnu/packages/mes.scm (stage0-boot): Update to new gitlab url scheme.
---
gnu/packages/mes.scm | 132 +--
1 file changed, 65 insertions(+), 67 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index bcae9fb..1cb4f52 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -82,77 +82,75 @@
"0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb"
(define-public stage0-boot
- (let ((version "0.0.8")
+ (let ((version "0.0.8")
(revision "0")
(commit "14843efa5ed13372b1ec32a76d19f27b3febab91"))
- (package
-(name "stage0-boot")
-(version (string-append version "-" revision "." (string-take commit 7)))
-(synopsis "Manually created initial hex programs for full source
bootstrapping")
-(source (origin
- (method url-fetch)
- (uri (string-append "https://gitlab.com/janneke/stage0;
- "/repository/archive.tar.gz?ref="
- commit))
- (file-name (string-append name "-" version ".tar.xz"))
- (sha256
- (base32
-"0ws5g4r1rnyfaxrnyqzh4qr3w2a3i3wljcc095rk897wi1xz23jz"
-(native-inputs
- `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
- ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
- ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
- ("stage0-seed"
-,(origin
- (method url-fetch)
- (uri (string-append "https://gitlab.com/janneke/stage0-seed;
- "/repository/archive.tar.gz?ref="
- "87039121e9ab4d48e9bade513c6f328cc9968583"))
- (file-name (string-append "stage0-seed" "-" version ".tar.xz"))
- (sha256
-(base32
- "0m18mv825nykj738gg9il60xb8xxc4015ypxgimhygdqxx0n66bp"))
-(supported-systems '("i686-linux" "x86_64-linux"))
-(build-system trivial-build-system)
-(arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "static-bash"))
-(tar (assoc-ref %build-inputs "tar"))
-(xz (assoc-ref %build-inputs "xz"))
-(source (assoc-ref %build-inputs "source"))
-(stage0-seed (assoc-ref %build-inputs "stage0-seed"))
-(out (assoc-ref %outputs "out"))
-(out/bin (string-append out "/bin")))
- (setenv "PATH" (string-append bash "/bin:"
- "../stage0-seed:"
- tar "/bin:"
- xz "/bin"))
- (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
- (mkdir-p "source")
- (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
- (mkdir-p "stage0-seed")
- (system* "tar" "--strip=1" "-C" "stage0-seed" "-xvf" stage0-seed)
- (chdir "source")
- (zero? (system (string-append
-"set -ex;"
-"mkdir -p " out/bin ";"
-"hex Linux\\ Bootstrap/hex.hex > " out/bin "/hex;"
-;; FIXME: exec-enable?
-;;"hex Linux\\ Bootstrap/exec_enable.hex > " out/bin "/exec_enable;"
-;;"exec_enable " out/bin "/hex"
-;;"exec_enable " out/bin "/exec_enable"
-"chmod +x " out/bin "/hex"
-)))
-(description
- "Stage0 is the initial stage of a full source bootstrapping process. It
+(package
+ (name "stage0-boot")
+ (version (string-append version "-" revision "." (string-take commit 7)))
+ (synopsis "Manually created initial hex programs for full source
bootstrapping")
+ (source (origin
+(method url-fetch)
+(uri (string-append "https://gitlab.com/janneke/stage0;
+
44/163: gnu: nyacc-boot: Update to new gitlab url scheme.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 9f5e4cb9676105414873a6fd4a367883935b99c6
Author: Jan Nieuwenhuizen
Date: Sat Apr 21 23:09:41 2018 +0200
gnu: nyacc-boot: Update to new gitlab url scheme.
* gnu/packages/mes.scm (nyacc-boot): Update to new gitlab url scheme.
---
gnu/packages/mes.scm | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 1cb4f52..ce0f4ae 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -320,12 +320,11 @@ Guile-] Scheme interpreter prototype in C and a
Nyacc-based C compiler in
(source (origin
(method url-fetch)
(uri (string-append "https://gitlab.com/janneke/nyacc;
-"/repository/archive.tar.gz?ref="
-commit))
-(file-name (string-append name "-" version ".tar.xz"))
+"/-/archive/" commit
+"/nyacc-" commit ".tar.gz"))
(sha256
(base32
- "046bf0935fa0zfwncd5sr3dm103ijsrvzbanq22a4gps30ck7hmc"
+ "0dlcqmchhl57nh7f0v6qb1kkbi7zbs3b185hcqv57fhb60b7rgcq"
(build-system gnu-build-system)
(native-inputs
`(("guile" ,guile-2.2)))
83/163: gnu: %mescc-tools-seed: Update for linux-4.17 elf32-header fix.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 8728047de2f38819a49b3a90d5a46696bbafd615 Author: Jan Nieuwenhuizen Date: Sat Jun 16 09:23:17 2018 +0200 gnu: %mescc-tools-seed: Update for linux-4.17 elf32-header fix. * gnu/packages/mes.scm (%mescc-tools-seed): Update for linux-4.17 elf32-header fix. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 99d66a8..1de8329 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -46,7 +46,7 @@ (define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up? (define %mescc-tools-seed - (let ((commit"32881b9ff21fb41dc846914753b6cdadd75927c4")) + (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed; @@ -54,7 +54,7 @@ "/mescc-tools-seed-" commit ".tar.gz")) (sha256 (base32 -"0p5lk4wnb56jxmxxfdx31wgakhhid9xqsimf19c4pnvwlzpm4wan") +"0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v") (define %mes-seed (let ((commit "c4a2ee984a862b0285866dc415fd82c285d77159"))
84/163: gnu: mescc-tools-boot: Update for linux-4.17 elf32-header fix.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 54491e69e10a8ae4e951ec6267e2978dcf818630
Author: Jan Nieuwenhuizen
Date: Sat Jun 16 09:25:09 2018 +0200
gnu: mescc-tools-boot: Update for linux-4.17 elf32-header fix.
* gnu/packages/mes.scm (mescc-tools-boot): Update for linux-4.17
elf32-header
fix.
---
gnu/packages/mes.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 1de8329..55d5242 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -160,8 +160,8 @@ with a Knight VM that runs Forth and Lisp.")
(define-public mescc-tools-boot
(let ((version "0.4")
-(revision "0")
-(commit "9cbee90b4265d085c751ce2ce63fd8e972148638"))
+(revision "1")
+(commit "f02b8f4fda8d0c5c11a1d63a02b2bfdfab55abc5"))
(package-with-bootstrap-guile
(package
(name "mescc-tools-boot")
@@ -175,7 +175,7 @@ with a Knight VM that runs Forth and Lisp.")
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1ah9f2f45mnb695wsh16rz3y92w6mz99z7y4basln3ba0gc7l7nh"
+ "14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf"
(native-inputs
`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
("bash" ,(search-bootstrap-binary "bash" (%current-system)))
100/163: gnu: m4:mesboot: Rename from m4-boot.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 9663cafb218c5115773d38c8665b0fe34543a70e Author: Jan Nieuwenhuizen Date: Sat Jun 23 19:46:26 2018 +0200 gnu: m4:mesboot: Rename from m4-boot. * gnu/packages/mes.scm (m4-mesboot): Rename from m4-boot. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index a7345a6..b51d188 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -603,10 +603,10 @@ standard.") (delete-file (string-append out "/lib/tcc/libtcc1.a")) (copy-file "libtcc1.a" (string-append out "/lib/tcc/libtcc1.a") -(define-public m4-boot +(define-public m4-mesboot (package (inherit m4) -(name "m4-boot") +(name "m4-mesboot") (version "1.4") (source (origin (method url-fetch)
71/163: gnu: gcc-boot: Update to 2.95.3.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ed3de44c59d61759f786c394ff0f2fcc71421ceb
Author: Jan Nieuwenhuizen
Date: Sun Jun 10 10:48:38 2018 +0200
gnu: gcc-boot: Update to 2.95.3.
* gnu/packages/mes.scm (gcc-boot): Update to 2.95.3
* gnu/packages/patches (gcc-boot-2.95.3.patch): New file.
* gnu/packages/patches (gcc-boot-2.6.3.patch): Remove.
* gnu/local.mk (dist_patch_DATA): Rename it.
---
gnu/local.mk | 2 +-
gnu/packages/mes.scm | 100
gnu/packages/patches/gcc-boot-2.6.3.patch | 397 -
gnu/packages/patches/gcc-boot-2.95.3.patch | 172 +
4 files changed, 229 insertions(+), 442 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 57c7e1b..548a7ea 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -696,7 +696,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-asan-missing-include.patch \
- %D%/packages/patches/gcc-boot-2.6.3.patch\
+ %D%/packages/patches/gcc-boot-2.95.3.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 48fec16..fe93a7e 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -595,76 +595,88 @@ standard.")
(package
(inherit gcc)
(name "gcc-boot")
-(version "2.6.3")
+(version "2.95.3")
(source (origin
(method url-fetch)
- (uri (string-append
"https://gcc.gnu.org/pub/gcc/old-releases/gcc-2/gcc-;
- version ".tar.bz2"))
- ;; tarball contains read-only sources
- ;; (patches (search-patches "gcc-boot.patch"))
+ (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
+ version
+ ".tar.gz"))
+ (patches (search-patches "gcc-boot-2.95.3.patch"))
(sha256
(base32
-"0h61wd59fbk02pprlxsj67ph8rqw4avfr8bbp85g5isdky277xki"
+"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
(supported-systems '("i686-linux"))
-(native-inputs `(;;("binutils" ,binutils-boot)
- ,(let ((triplet "i686-unknown-linux-gnu")) ;; MORTAL SIN
HERE
-`("binutils" ,(cross-binutils triplet)))
- ("mes" ,mes-boot)
- ("tcc" ,tcc-boot)
- ("patch" ,(local-file (car (search-patches
"gcc-boot.patch"))
+(native-inputs `(("binutils" ,binutils-boot)
+ ("tcc" ,tcc-boot)))
(outputs '("out"))
(arguments
`(#:tests? #f ; runtest: command not found
+ #:parallel-build? #f
#:strip-binaries? #f
- #:make-flags '("CC=tcc -static"
- "LANGUAGES=c"
- "ALLOCA=alloca.o"
- "CC=tcc -static"
- "OLDCC=tcc -static")
+ #:make-flags (list "CC=tcc -static"
+ "OLDCC=tcc -static"
+ "RANLIB=true"
+ (string-append "LIBGCC2_INCLUDES=-I "
+ (assoc-ref %build-inputs "tcc")
+ "/include")
+ "LANGUAGES=c")
#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'chmod
- (lambda _
- (let ((patch (assoc-ref %build-inputs "patch")))
- (format #t "hiero: ~s\n" (getcwd))
- (system* "ls" "-ltrF")
- (system* "chmod" "-R" "+w" ".")
- (system* "ls" "-ltrF")
- (system (string-append "patch -p1 < " patch)
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
- (binutils (assoc-ref %build-inputs "binutils")))
-
76/163: Revert "gnu: gcc-boot: Update to 3.2."
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ffed16e1f1f2e667a8bba8321c8ad8011173a41c
Author: Jan Nieuwenhuizen
Date: Sun Jun 10 20:08:02 2018 +0200
Revert "gnu: gcc-boot: Update to 3.2."
This reverts commit c228030ad0619b1de460f6d90831b5298ceaa9a6.
---
gnu/local.mk| 2 +-
gnu/packages/mes.scm| 12 +--
gnu/packages/patches/gcc-boot-3.0.patch | 37 +
gnu/packages/patches/gcc-boot-3.2.patch | 34 --
4 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ed50249..18ed844 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -696,7 +696,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-asan-missing-include.patch \
- %D%/packages/patches/gcc-boot-3.2.patch \
+ %D%/packages/patches/gcc-boot-3.0.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index fde5431..6c95ad8 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -595,16 +595,16 @@ standard.")
(package
(inherit gcc)
(name "gcc-boot")
-(version "3.2")
+(version "3.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnu/gcc/gcc-3.2/gcc-core-"
+ (uri (string-append "mirror://gnu/gcc/gcc-3.0/gcc-core-"
version
".tar.gz"))
- (patches (search-patches "gcc-boot-3.2.patch"))
+ (patches (search-patches "gcc-boot-3.0.patch"))
(sha256
(base32
-"1pyik02gmi425d110m8j0gavp3lkqlg5rlh71hng12rha35dplsj"
+"13x04j77h9jw7g74v41s7jvxb2n3nx0mdvg8cf3i2bm306mss5vk"
(supported-systems '("i686-linux"))
(native-inputs `(("binutils" ,binutils-boot)
("tcc" ,tcc-boot)))
@@ -659,8 +659,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
(replace 'build
(lambda* (#:key make-flags #:allow-other-keys)
(let ((tcc-boot (assoc-ref %build-inputs "tcc")))
- (system* "ar" "r" "libg.a"
-(string-append tcc-boot "/lib/x86-mes-gcc/libg.o"))
+ ;; (system* "ar" "r" "libg.a"
+ ;; (string-append tcc-boot "/lib/x86-mes-gcc/libg.o"))
(and (zero? (apply system* (cons "make" make-flags)))
;; (system* "make" "stage1" "LANGUAGES=c")
;; (zero? (system* "make" "CC=stage1/xgcc -Bstage1/"
diff --git a/gnu/packages/patches/gcc-boot-3.0.patch
b/gnu/packages/patches/gcc-boot-3.0.patch
new file mode 100644
index 000..868ed82
--- /dev/null
+++ b/gnu/packages/patches/gcc-boot-3.0.patch
@@ -0,0 +1,37 @@
+diff -purN -x config.status -x config.h -x BOOT ../gcc-3.0/gcc/config.gcc
gcc-3.0/gcc/config.gcc
+--- ../gcc-3.0/gcc/config.gcc 2001-06-05 21:09:51.0 +0200
gcc-3.0/gcc/config.gcc 2018-06-07 23:08:25.167767955 +0200
+@@ -1210,6 +1210,7 @@ i[34567]86-*-linux*) # Intel 80386's run
+ tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
+ tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
+ extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
++ extra_parts=""
+ gnu_ld=yes
+ float_format=i386
+ if test x$enable_threads = xyes; then
+diff -purN -x config.status -x config.h -x BOOT ../gcc-3.0/gcc/Makefile.in
gcc-3.0/gcc/Makefile.in
+--- ../gcc-3.0/gcc/Makefile.in 2001-06-13 07:05:35.0 +0200
gcc-3.0/gcc/Makefile.in2018-06-07 17:14:44.405516220 +0200
+@@ -263,8 +263,8 @@ SPLAY_TREE_H= $(srcdir)/../include/splay
+ CROSS_SYSTEM_HEADER_DIR = $(tooldir)/sys-include
+
+ # Control whether to run fixproto and fixincludes.
+-STMP_FIXPROTO = stmp-fixproto
+-STMP_FIXINC = stmp-fixinc
++STMP_FIXPROTO = #stmp-fixproto
++STMP_FIXINC = # stmp-fixinc
+
+ # Test to see whether exists in the system header files.
+ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
+diff -purN -x config.status -x config.h -x BOOT ../gcc-3.0/gcc/timevar.c
gcc-3.0/gcc/timevar.c
+--- ../gcc-3.0/gcc/timevar.c 2001-03-02 20:51:59.0 +0100
134/163: gnu: mescc-tools-boot: Use gnu-build-system.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ceef3a8075292a55f5d2d6b113253558c8ec3ffd
Author: Jan Nieuwenhuizen
Date: Thu Aug 23 17:33:33 2018 +0200
gnu: mescc-tools-boot: Use gnu-build-system.
* gnu/packages/mes.scm (mescc-tools-boot): Use gnu-build-system.
---
gnu/packages/mes.scm | 78 +++-
1 file changed, 46 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 62857cb..f467667 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -118,7 +118,7 @@ with a Knight VM that runs Forth and Lisp.")
(license gpl3+
(define-public mescc-tools-boot
- (let ((version "0.4")
+ (let ((version "0.4")
(revision "1")
(commit "f02b8f4fda8d0c5c11a1d63a02b2bfdfab55abc5"))
(package-with-bootstrap-guile
@@ -141,38 +141,52 @@ with a Knight VM that runs Forth and Lisp.")
("mes-source" ,(package-source mes-boot))
("mes-seed" ,%mes-seed)))
(supported-systems '("i686-linux" "x86_64-linux"))
- (build-system trivial-build-system)
+ (build-system gnu-build-system)
(arguments
-`(#:modules ((guix build utils))
- #:builder
- (begin
-(use-modules (guix build utils))
-(let* ((coreutils (assoc-ref %build-inputs "coreutils"))
- (source (assoc-ref %build-inputs "source"))
- (mescc-tools-seed (assoc-ref %build-inputs
"mescc-tools-seed"))
- (mes-seed (assoc-ref %build-inputs "mes-seed"))
- (mes-source (assoc-ref %build-inputs "mes-source"))
- (out (assoc-ref %outputs "out"))
- (out/bin (string-append out "/bin")))
- (setenv "PATH" (string-append coreutils "/bin"
-":" "../mescc-tools-seed"))
- (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
- (mkdir-p "source")
- (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
- (mkdir-p "mescc-tools-seed")
- (system* "tar" "--strip=1" "-C" "mescc-tools-seed" "-xvf"
mescc-tools-seed)
- (mkdir-p "mes-source")
- (system* "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source)
- (mkdir-p "mes-seed")
- (system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
- (chdir "source")
- (setenv "PREFIX" out)
- (setenv "MES_PREFIX" "../mes-source")
- (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed")
- (setenv "MES_SEED" "../mes-seed")
- (and (zero? (system* "sh" "build.sh"))
- (zero? (system* "sh" "check.sh"))
- (zero? (system* "sh" "install.sh")))
+`(#:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries
+ #:phases
+ (modify-phases %standard-phases
+(add-after 'unpack 'unpack-seeds
+ (lambda* (#:key outputs #:allow-other-keys)
+(let* ((coreutils (assoc-ref %build-inputs "coreutils"))
+ (mescc-tools-seed (assoc-ref %build-inputs
"mescc-tools-seed"))
+ (mes-seed (assoc-ref %build-inputs "mes-seed"))
+ (mes-source (assoc-ref %build-inputs "mes-source"))
+ (out (assoc-ref %outputs "out")))
+ (setenv "PATH" (string-append coreutils "/bin"))
+ (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
+ (with-directory-excursion ".."
+(and
+ (mkdir-p "mescc-tools-seed")
+ (zero? (system* "tar" "--strip=1" "-C" "mescc-tools-seed"
+ "-xvf" mescc-tools-seed))
+ (mkdir-p "mes-source")
+ (zero? (system* "tar" "--strip=1" "-C" "mes-source"
+ "-xvf" mes-source))
+ (mkdir-p "mes-seed")
+
67/163: Revert "gnu: binutils-boot: Update to 2.30."
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 37a76455f6d38b07467476f191cbcc6c9c72de6e
Author: Jan Nieuwenhuizen
Date: Sun Jun 10 10:38:41 2018 +0200
Revert "gnu: binutils-boot: Update to 2.30."
This reverts commit 68bc804acd319dc9d88d2c02353bf99380394abe.
---
gnu/packages/mes.scm | 6 +-
gnu/packages/patches/binutils-boot-2.30.patch | 282 --
2 files changed, 3 insertions(+), 285 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index a83a8f6..41fbcf8 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -545,15 +545,15 @@ standard.")
(package
(inherit binutils)
(name "binutils-boot")
-(version "2.30")
+(version "2.25")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/binutils/binutils-"
version ".tar.gz"))
- (patches (search-patches "binutils-boot-2.30.patch"))
+ (patches (search-patches "binutils-boot-2.25.patch"))
(sha256
(base32
-"1sp9g7zrrcsl25hxiqzmmcrdlbm7rbmj0vki18lks28wblcm0f4c"
+"0b9gj330zjv5hby6kgf1nda5ca7pp3z1ips6dykm46mld1qkgkyc"
(supported-systems '("i686-linux"))
(native-inputs `(("flex" ,flex) ; MORTAL SIN HERE
("mes" ,mes-boot)
diff --git a/gnu/packages/patches/binutils-boot-2.30.patch
b/gnu/packages/patches/binutils-boot-2.30.patch
deleted file mode 100644
index 80028a4..000
--- a/gnu/packages/patches/binutils-boot-2.30.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-libiberty/md5.c does not compile with our (patched) tcc-0.9.26,
-so we use md5.c from binutils-2.14
-
-tcc-0.9.27 is known to compile that file, this md5.c patch can be
-removed after upgrading tcc.
-
-diff -purN -x config.status -x config.h -x BOOT
../binutils-2.30/bfd/Makefile.in binutils-2.30/bfd/Makefile.in
../binutils-2.30/bfd/Makefile.in 2018-01-27 15:58:29.0 +0100
-+++ binutils-2.30/bfd/Makefile.in 2018-06-09 22:10:42.546333481 +0200
-@@ -386,7 +386,7 @@ libbfd_la_LDFLAGS = $(am__append_1) -rel
- # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is
- # -I../zlib, unless we were configured with --with-system-zlib, in which
- # case both are empty.
--ZLIB = @zlibdir@ -lz
-+ZLIB = #@zlibdir@
- ZLIBINC = @zlibinc@
- AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
- AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
-diff -purN -x config.status -x config.h -x BOOT
../binutils-2.30/binutils/Makefile.in binutils-2.30/binutils/Makefile.in
../binutils-2.30/binutils/Makefile.in 2018-01-27 16:02:51.0
+0100
-+++ binutils-2.30/binutils/Makefile.in 2018-06-09 22:55:02.974051534 +0200
-@@ -357,7 +357,7 @@ LEX = `if [ -f ../flex/flex ]; then echo
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBICONV = @LIBICONV@
--LIBINTL = @LIBINTL@
-+LIBINTL = @LIBINTL@ ../zlib/libz.a
- LIBINTL_DEP = @LIBINTL_DEP@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-@@ -476,7 +476,7 @@ am__skipyacc =
- # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is
- # -I../zlib, unless we were configured with --with-system-zlib, in which
- # case both are empty.
--ZLIB = @zlibdir@ -lz
-+ZLIB = @zlibdir@ $(PWD)/../zlib/libz.a
- ZLIBINC = @zlibinc@
- AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
- AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD) $(ZLIBINC)
-diff -purN -x config.status -x config.h -x BOOT
../binutils-2.30/gas/Makefile.in binutils-2.30/gas/Makefile.in
../binutils-2.30/gas/Makefile.in 2018-01-27 15:59:06.0 +0100
-+++ binutils-2.30/gas/Makefile.in 2018-06-09 22:15:27.247014898 +0200
-@@ -215,7 +215,7 @@ LDFLAGS = @LDFLAGS@
- LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo @LEX@ ; fi`
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
--LIBINTL = @LIBINTL@
-+LIBINTL = @LIBINTL@ ../zlib/libz.a
- LIBINTL_DEP = @LIBINTL_DEP@
- LIBM = @LIBM@
- LIBOBJS = @LIBOBJS@
-diff -purN -x config.status -x config.h -x BOOT ../binutils-2.30/gas/read.c
binutils-2.30/gas/read.c
../binutils-2.30/gas/read.c2018-01-13 14:31:15.0 +0100
-+++ binutils-2.30/gas/read.c 2018-06-09 20:08:32.809230911 +0200
-@@ -38,7 +38,9 @@
- #include "obstack.h"
- #include "ecoff.h"
- #include "dw2gencfi.h"
-+#if !MES_BOOTSTRAP
- #include "wchar.h"
-+#endif
-
- #ifndef TC_START_LABEL
- #define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR) (NEXT_CHAR == ':')
-diff -purN -x config.status -x config.h -x BOOT
../binutils-2.30/gprof/Makefile.in binutils-2.30/gprof/Makefile.in
../binutils-2.30/gprof/Makefile.in 2018-01-27 16:02:44.0 +0100
-+++ binutils-2.30/gprof/Makefile.in2018-06-09 22:58:52.717801489 +0200
-@@ -229,7
97/163: gnu: gcc-boot: build with %cheat-binutils?
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit eeacb03f8979df84fb5bed51a0ec780d44dd71ea
Author: Jan Nieuwenhuizen
Date: Wed Jun 20 17:42:39 2018 +0200
gnu: gcc-boot: build with %cheat-binutils?
* gnu/packages/mes.scm (gcc-boot): WIP
---
gnu/packages/mes.scm | 80 ++---
gnu/packages/patches/gcc-boot-2.95.3.patch | 179 +++--
2 files changed, 205 insertions(+), 54 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 2a78445..9405d29 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -1035,10 +1035,23 @@ ac_cv_c_float_format='IEEE (little-endian)'
(package
(inherit gcc-core-boot)
(name "gcc-boot")
+(version "2.95.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
+ version
+ ".tar.gz"))
+ (patches (search-patches ;;"gcc-core-boot-2.95.3.patch"
+ "gcc-boot-2.95.3.patch"
+ ))
+ (sha256
+ (base32
+"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
(supported-systems '("i686-linux"))
(native-inputs `(("binutils" ,binutils-boot0)
("gcc" ,gcc-core-boot)
- ("glibc" ,glibc-boot)))
+ ("glibc" ,glibc-boot)
+ ("kernel-headers" ,(linux-libre-headers-boot0
(outputs '("out"))
(arguments
`(#:tests? #f ; runtest: command not found
@@ -1056,30 +1069,62 @@ ac_cv_c_float_format='IEEE (little-endian)'
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (binutils (assoc-ref %build-inputs "binutils"))
- (cppflags (string-append
- " -D __STDC__=1"
- " -D __GLIBC_MINOR__=6"
- )))
+ (let* ((out (assoc-ref outputs "out"))
+(binutils (assoc-ref %build-inputs "binutils"))
+(gcc (assoc-ref %build-inputs "gcc"))
+(glibc (assoc-ref %build-inputs "glibc"))
+(headers (assoc-ref %build-inputs "kernel-headers")))
(when #t ;; no info
(delete-file-recursively "texinfo")
(system "touch gcc/cpp.info gcc/gcc.info"))
- ;; MORTAL SIN: use pre-built binary seed
- (setenv "PATH" (string-append
- binutils "/i686-unknown-linux-gnu/bin"
- ":" (getenv "PATH")))
+ (setenv "PATH"
+ (string-append
+;;(assoc-ref %build-inputs "flex") "/bin"
+;;":"
+(assoc-ref %build-inputs "binutils") "/bin"
+":" (assoc-ref %build-inputs "gcc") "/bin"
+
+;; REMOVE NEW glibc/bin from path
+;; we suddenly get this error: linux/errno.h
+;; via a glibc-2.25 errno.h
+
+":" (assoc-ref %build-inputs "bash") "/bin"
+;; ":" (assoc-ref %build-inputs "bzip2") "/bin"
+":" (assoc-ref %build-inputs "coreutils") "/bin"
+;; ":" (assoc-ref %build-inputs "diffutils") "/bin"
+;; ":" (assoc-ref %build-inputs "file") "/bin"
+;; ":" (assoc-ref %build-inputs "findutils") "/bin"
+;; ":" (assoc-ref %build-inputs "gawk") "/bin"
+":" (assoc-ref %build-inputs "grep") "/bin"
+":" (assoc-ref %build-inputs "gzip") "/bin"
+;; ":" (assoc-ref %build-inputs "m4") "/bin"
+":" (assoc-ref %build-inputs "make") "/bin"
+;; ":" (assoc-ref %build-inputs "pa
110/163: Revert "REMOVEME: %fake-bootstrap => #t."
janneke pushed a commit to branch wip-bootstrap in repository guix. commit b820bebdb0a044a8988b1a1c494c1571b9cea218 Author: Jan Nieuwenhuizen Date: Mon Jun 25 21:17:48 2018 +0200 Revert "REMOVEME: %fake-bootstrap => #t." This reverts commit 594f6d55215711c185cb8dd8429365ecfc39699a. --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index fd5af35..744b10d 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -44,7 +44,7 @@ #:use-module (guix utils) #:use-module (guix gexp)) -(define %fake-bootstrap? #t) ; cheat using Guile instead of Mes for speed-up? +(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up? (define %mescc-tools-seed (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb"))
80/163: gnu: Add gcc-core-boot 2.95.3.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 428ae7a377ba86d839f54e287205f8660d11d158
Author: Jan Nieuwenhuizen
Date: Sun Jun 10 20:10:58 2018 +0200
gnu: Add gcc-core-boot 2.95.3.
* gnu/packages/mes.scm (gcc-core-boot0): Rename from gcc-boot.
* gnu/packages/mes.scm (gcc-core-boot): New variable.
---
gnu/packages/mes.scm | 71 +---
1 file changed, 68 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 9667579..99d66a8 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -591,10 +591,10 @@ standard.")
"--target=i386-unknown-linux"
(string-append "--prefix=" out
-(define-public gcc-boot
+(define-public gcc-core-boot
(package
(inherit gcc)
-(name "gcc-boot")
+(name "gcc-core-boot")
(version "2.95.3")
(source (origin
(method url-fetch)
@@ -694,7 +694,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
"1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"
(supported-systems '("i686-linux"))
(native-inputs `(("binutils" ,binutils-boot)
- ("gcc" ,gcc-boot)))
+ ("gcc" ,gcc-core-boot)))
(propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0
(outputs '("out"))
(arguments
@@ -748,6 +748,71 @@ ac_cv_c_float_format='IEEE (little-endian)'
(zero?
(apply system* "make" "install-lib-all" "install-headers"
make-flags)
+(define-public gcc-boot
+ (package
+(inherit gcc-core-boot)
+(name "gcc-boot")
+(supported-systems '("i686-linux"))
+(native-inputs `(;;("binutils" ,binutils-boot)
+ ,(let ((triplet "i686-unknown-linux-gnu")) ;; MORTAL SIN
HERE
+`("binutils" ,(cross-binutils triplet)))
+ ("gcc" ,gcc-core-boot)
+ ("glibc" ,glibc-boot)))
+(outputs '("out"))
+(arguments
+ `(#:tests? #f ; runtest: command not found
+ #:parallel-build? #f
+ #:strip-binaries? #f
+ #:make-flags (list "RANLIB=true"
+ (string-append "LIBGCC2_INCLUDES=-I "
+ (assoc-ref %build-inputs "gcc")
+ "/include")
+ "LANGUAGES=c")
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-1))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (binutils (assoc-ref %build-inputs "binutils"))
+ (cppflags (string-append
+ " -D __STDC__=1"
+ " -D __GLIBC_MINOR__=6"
+ )))
+ (when #t ;; no info
+ (delete-file-recursively "texinfo")
+ (system "touch gcc/cpp.info gcc/gcc.info"))
+
+ ;; MORTAL SIN: use pre-built binary seed
+ (setenv "PATH" (string-append
+ binutils "/i686-unknown-linux-gnu/bin"
+ ":" (getenv "PATH")))
+
+ (setenv "CONFIG_SHELL" (string-append
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh"))
+ (unsetenv "C_INCLUDE_PATH") ; flex
+ (unsetenv "LIBRARY_PATH")
+ (setenv "CPPFLAGS" cppflags)
+ (setenv "CC" (string-append "gcc" cppflags))
+ (setenv "CPP" (string-append "gcc -E" cppflags))
+ (setenv "RANLIB" "true")
+ (with-output-to-file "config.cache"
+ (lambda _
+ (display "
+ac_cv_c_float_format='IEEE (little-endian)'
+")))
+ (and
+(zero?
+ (system* "./configure"
+ ;;"--disable-shared"
+ ;;"--enable-static"
+ "--host=i386-unknown-linux"
+ "--target=i386-unknown-linux"
+ (string-append "--prefix=" out
+
;;;
(define-public nyacc
140/163: gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8683d1740e8469d0bb2978522288f26e36d14f39
Author: Jan Nieuwenhuizen
Date: Thu Aug 23 22:52:29 2018 +0200
gnu: Add %diffutils-static, %diffutils-static-stripped,
%diffutils-bootstrap-tarball.
* gnu/packages/make-bootstrap.scm (%diffutils-static,
%diffutils-static-stripped, %diffutils-bootstrap-tarball): New variable.
---
gnu/packages/make-bootstrap.scm | 52 +
1 file changed, 52 insertions(+)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index efef713..a84cfb3 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -41,6 +41,7 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:export (%bootstrap-binaries-tarball
+%diffutils-bootstrap-tarball
%make-bootstrap-tarball
%binutils-bootstrap-tarball
%glibc-bootstrap-tarball
@@ -301,6 +302,53 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(license gpl3+)
(home-page #f)))
+(define %diffutils-static
+ ;; Statically-linked Diffutils.
+ (package
+(inherit diffutils)
+(name "diffutils-static")
+(arguments
+ `(#:strip-flags '("--strip-all")
+ #:make-flags '("V=2")
+ #:phases (modify-phases %standard-phases
+ (add-before 'configure 'all-static
+(lambda _
+ ;; The `-all-static' libtool flag can only be passed
+ ;; after `configure', since configure tests don't use
+ ;; libtool, and only for executables built with libtool.
+ (substitute* '("Makefile.in"
+ "src/Makefile.in")
+(("^LDFLAGS =(.*)$" line)
+ (string-append line
+"\nAM_LDFLAGS = -static\n"))
+
+(define %diffutils-static-stripped
+ ;; The subset of Diffutils that we need.
+ (package (inherit %diffutils-static)
+(name (string-append (package-name %diffutils-static) "-stripped"))
+(build-system trivial-build-system)
+(outputs '("out"))
+(arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+
+ (setvbuf (current-output-port) _IOLBF)
+ (let* ((in (assoc-ref %build-inputs "diffutils"))
+(out (assoc-ref %outputs "out"))
+(bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (for-each (lambda (file)
+ (let ((target (string-append bin "/" file)))
+ (format #t "copying `~a'...~%" file)
+ (copy-file (string-append in "/bin/" file)
+target)
+ (remove-store-references target)))
+ '("cmp" "diff"))
+ #t
+(inputs `(("diffutils" ,%diffutils-static)
+
(define %make-static
;; Statically-linked Make.
(package
@@ -702,6 +750,10 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
;; A tarball with the statically-linked bootstrap binaries.
(tarball-package %static-binaries))
+(define %diffutils-bootstrap-tarball
+ ;; A tarball with the statically-linked Diffutils programs.
+ (tarball-package %diffutils-static-stripped))
+
(define %make-bootstrap-tarball
;; A tarball with the statically-linked Make programs.
(tarball-package %make-static-stripped))
99/163: gnu: Remove binutils-boot0-cheat.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f178a4045bf04ef138d413f39892704129c7f084
Author: Jan Nieuwenhuizen
Date: Sat Jun 23 14:40:25 2018 +0200
gnu: Remove binutils-boot0-cheat.
* gnu/packages/mes.scm (binutils-boot0-cheat): Remove.
---
gnu/packages/mes.scm | 85 ++--
1 file changed, 2 insertions(+), 83 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 50b29d1..a7345a6 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -637,8 +637,8 @@ standard.")
(package
(inherit binutils)
(name "binutils-boot0")
- (version "2.20.1a")
- (source (origin
+(version "2.20.1a")
+(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/binutils/binutils-"
version ".tar.bz2"))
@@ -715,87 +715,6 @@ standard.")
(copy-file (string-append binutils "/bin/ar") "binutils/ar")
(copy-file (string-append binutils "/bin/ld")
"ld/ld-new")
-(define-public binutils-boot0-cheat
- (let* ((triplet "i686-unknown-linux-gnu")
- (tool-prefix (string-append triplet "-")))
-(package
- (inherit binutils-boot0-real)
- (name "binutils-boot0-cheat")
- (supported-systems '("i686-linux"))
- (native-inputs `(("flex" ,flex) ; cheat
- ("binutils" ,(cross-binutils triplet))
- ("gcc" ,(cross-gcc triplet))
- ("glibc" ,(cross-libc triplet))
- ("kernel-headers" ,(linux-libre-headers-boot0
- (arguments
- `(#:tests? #f; runtest: command not found
- #:parallel-build? #f
- #:strip-binaries? #f
- #:make-flags (list "RANLIB=true")
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (glibc (assoc-ref %build-inputs "glibc"))
- (headers (assoc-ref %build-inputs "kernel-headers"))
- (cppflags (string-append " --static -static"
-" -D MES_BOOTSTRAP=1"
-" -B " glibc "/lib"
-" -I " glibc "/include"
-" -I " headers "/include"))
- (ldflags (string-append " --static -static"
- " -B " glibc "/lib")))
- (setenv "C_INCLUDE_PATH"
- (string-append glibc "/include"
-":" headers "/include"))
- (setenv "LIBRARY_PATH"
- (string-append glibc "/lib"))
- (setenv "PATH"
- (string-append
- (assoc-ref %build-inputs "flex") "/bin"
- ":" (assoc-ref %build-inputs "gcc") "/bin"
- ":" (assoc-ref %build-inputs "binutils") "/"
,triplet "/bin"
-
- ;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "bzip2") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ;;":" (assoc-ref %build-inputs "file") "/bin"
- ;;":" (assoc-ref %build-inputs "findutils") "/bin"
- ":" (assoc-ref %build-inputs "gawk") "/bin"
-
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ;;":" (assoc-ref %build-inputs "m4") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ;;":&
113/163: gnu: binutils-mesboot0: Package with bootstrap-guile.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit c28cd5a5d1248aed8a84c3a1322dfbbcc1a9343a
Author: Jan Nieuwenhuizen
Date: Fri Jun 29 21:15:57 2018 +0200
gnu: binutils-mesboot0: Package with bootstrap-guile.
* gnu/packages/mes.scm (binutils-mesboot0): Package with bootstrap-guile.
---
gnu/packages/mes.scm | 145 ++-
1 file changed, 73 insertions(+), 72 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 8a87d0a..afad180 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -637,80 +637,81 @@ standard.")
(string-append "--prefix=" out
(define-public binutils-mesboot0
- (package
-(inherit binutils)
-(name "binutils-mesboot0")
-(version "2.20.1a")
-(source (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"
-(supported-systems '("i686-linux"))
-(native-inputs `(("flex" ,flex) ; cheat
- ("mes" ,mes-boot)
- ("tcc" ,tcc-boot)))
-(arguments
- `(#:tests? #f ; runtest: command not found
- #:parallel-build? #f
- #:strip-binaries? #f
- #:make-flags '("AR=tcc -ar" "RANLIB=true")
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (cppflags (string-append
- " -D __STDC__=1 "
- " -D __GLIBC_MINOR__=6"
- " -D MES_BOOTSTRAP=1")))
- (unsetenv "C_INCLUDE_PATH") ; flex
- (unsetenv "CPLUS_INCLUDE_PATH") ; flex
- (unsetenv "CPATH") ; flex
- (unsetenv "LIBRARY_PATH") ; flex
- (setenv "PATH"
- (string-append
-(assoc-ref %build-inputs "flex") "/bin"
-":" (assoc-ref %build-inputs "tcc") "/bin"
-":" (assoc-ref %build-inputs "mes") "/bin"
+ (package-with-bootstrap-guile
+ (package
+ (inherit binutils)
+ (name "binutils-mesboot0")
+ (version "2.20.1a")
+ (source (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"
+ (supported-systems '("i686-linux"))
+ (native-inputs `(("flex" ,flex) ; cheat
+ ("mes" ,mes-boot)
+ ("tcc" ,tcc-boot)))
+ (arguments
+ `(#:tests? #f ; runtest: command not found
+#:parallel-build? #f
+#:strip-binaries? #f
+#:make-flags '("AR=tcc -ar" "RANLIB=true")
+#:phases
+(modify-phases %standard-phases
+ (replace 'configure
+(lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+(cppflags (string-append
+ " -D __STDC__=1 "
+ " -D __GLIBC_MINOR__=6"
+ " -D MES_BOOTSTRAP=1")))
+(unsetenv "C_INCLUDE_PATH") ; flex
+(unsetenv "CPLUS_INCLUDE_PATH") ; flex
+(unsetenv "CPATH") ; flex
+(unsetenv "LIBRARY_PATH") ; flex
+(setenv "PATH"
+(string-append
+ (assoc-ref %build-inputs "flex") "/bin"
+ ":" (assoc-ref %build-inputs "tcc") "/bin"
+ ":" (assoc-ref %build-inputs "mes") "/bin"
-;; more bootstrap cheats
-":" (assoc-ref %build-inputs "bash")
107/163: gnu: Add gcc-mesboot 4.1.0.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit c981fa7d389925a6cc6d3cb0d7aa2217672909a1
Author: Jan Nieuwenhuizen
Date: Sat Jun 23 21:26:29 2018 +0200
gnu: Add gcc-mesboot 4.1.0.
* gnu/packages/mes.scm (gcc-mesboot0): Rename from gcc-mesboot.
(gcc-mesboot): New package.
* gnu/packages/patches/gcc-boot-4.1.0.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/mes.scm | 291 +++---
gnu/packages/patches/gcc-boot-4.1.0.patch | 30 +++
3 files changed, 259 insertions(+), 63 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 76e6bbc..8dc23fe 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -698,6 +698,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-asan-missing-include.patch \
%D%/packages/patches/gcc-boot-2.95.3.patch \
+ %D%/packages/patches/gcc-boot-4.1.0.patch\
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 696f589..e6a35d3 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -31,6 +31,7 @@
#:use-module (gnu packages m4)
#:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages man)
+ #:use-module (gnu packages multiprecision)
#:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
#:use-module (gnu packages texinfo)
@@ -709,67 +710,6 @@ standard.")
"--target=i386-unknown-linux"
(string-append "--prefix=" out
-(define-public binutils-mesboot
- (package-with-bootstrap-guile
- (package
- (inherit binutils-mesboot0)
- (name "binutils-mesboot")
- (native-inputs `(("binutils-mesboot" ,binutils-mesboot0)
- ("glibc-mesboot" ,glibc-mesboot)
- ("gcc-mesboot" ,gcc-mesboot)
- ("kernel-headers" ,(linux-libre-headers-boot0
- (arguments
- `(#:parallel-build? #f
-#:configure-flags '("--enable-deterministic-archives"
-"--disable-nls"
-"--disable-shared"
-"--disable-werror"
-"--host=i386-unknown-linux"
-"--target=i386-unknown-linux"
-"--enable-static"
-"--enable-compressed-debug-sections=no"
-"--disable-gold"
-"--disable-plugins"
-"--disable-x86-relax-relocations"
-"--with-system-libz")
-#:phases
-(modify-phases %standard-phases
- (add-before 'configure 'setenv
-(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
-(gcc (assoc-ref %build-inputs "gcc-mesboot"))
-(glibc (assoc-ref %build-inputs "glibc-mesboot"))
-(kernel-headers (assoc-ref %build-inputs
"kernel-headers")))
-(setenv "C_INCLUDE_PATH"
-(string-append glibc "/include"
- ":" kernel-headers "/include"
- ":" gcc "/include"))
-(setenv "LIBRARY_PATH"
-(string-append glibc "/lib"
- ":" gcc "/lib"))
-(setenv "CPP" (string-append "gcc -E"))
-(setenv "AR" "ar")
-(setenv "RANLIB" "true")
-(setenv "PATH"
-(string-append
- (assoc-ref %build-inputs "binutils-mesboot") "/bin"
- ":" (assoc-ref %build-inputs "gcc-mesboot") "/bin"
-
- ;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "
98/163: gnu: binutils-boot0: Inject AR, LD from bootstrap-binaries.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit fe74bd11ab0671967a96a79b745c7a5b8a91ebde
Author: Jan Nieuwenhuizen
Date: Sat Jun 23 14:28:55 2018 +0200
gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries.
* gnu/packages/mes.scm (binutils-boot0): Inject AR,LD from bootstrap
binaries.
---
gnu/packages/mes.scm | 23 +++
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 9405d29..50b29d1 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -44,7 +44,6 @@
#:use-module (guix gexp))
(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up?
-(define %cheat-binutils? #t) ; cheat using binutils-boot0 compiled with
current tool-chain
(define %mescc-tools-seed
(let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb"))
@@ -634,11 +633,10 @@ standard.")
(system* "./configure"
(string-append "--prefix=" out)))
-(define-public binutils-boot0-real
+(define-public binutils-boot0
(package
(inherit binutils)
-(name (if %cheat-binutils? "binutils-boot0-real"
- "binutils-boot0"))
+(name "binutils-boot0")
(version "2.20.1a")
(source (origin
(method url-fetch)
@@ -709,15 +707,20 @@ standard.")
"--disable-werror"
"--host=i386-unknown-linux"
"--target=i386-unknown-linux"
- (string-append "--prefix=" out
+ (string-append "--prefix=" out)))
+ (add-after 'build 'cheat:inject-AR,LD
+ (lambda* _
+ (let ((binutils (assoc-ref %build-inputs "binutils")))
+ ;; cheat: AR and LD are buggy in bootstrap build
+ (copy-file (string-append binutils "/bin/ar") "binutils/ar")
+ (copy-file (string-append binutils "/bin/ld")
"ld/ld-new")
(define-public binutils-boot0-cheat
(let* ((triplet "i686-unknown-linux-gnu")
(tool-prefix (string-append triplet "-")))
(package
(inherit binutils-boot0-real)
- (name (if %cheat-binutils? "binutils-boot0"
-"binutils-boot0-cheat"))
+ (name "binutils-boot0-cheat")
(supported-systems '("i686-linux"))
(native-inputs `(("flex" ,flex) ; cheat
("binutils" ,(cross-binutils triplet))
@@ -793,13 +796,9 @@ standard.")
"--target=i386-unknown-linux"
(string-append "--prefix="
out)
-(define-public binutils-boot0
- (if %cheat-binutils? binutils-boot0-cheat
- binutils-boot0-real))
-
(define-public binutils-boot
(package
-(inherit binutils-boot0-real)
+(inherit binutils-boot0)
(name "binutils-boot")
(native-inputs `(("flex" ,flex) ; cheat
("glibc" ,glibc-boot)
87/163: gnu: %mes-seed: Update for mes 0.16.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit a45cce85a30313c257b6e8d58898ad4bb8b52c35 Author: Jan Nieuwenhuizen Date: Sun Jun 17 08:59:54 2018 +0200 gnu: %mes-seed: Update for mes 0.16. * gnu/packages/mes.scm (%mes-seed): Update for mes 0.16. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 1bfc1da..365c953 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -57,7 +57,7 @@ "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v") (define %mes-seed - (let ((commit "c4a2ee984a862b0285866dc415fd82c285d77159")) + (let ((commit "e9e4c291b20ec134bb2e756238a1feb85747dfc0")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes-seed; @@ -65,7 +65,7 @@ "/mes-seed-" commit ".tar.gz")) (sha256 (base32 -"10rzfcjawcc97r0hc7b5m42z5bhaljbmwrnm7xsrliy6s881vz8s") +"0s4h72wza9gxgihfbcnz6f8j4ds9vik2703n9dziv6ck95j1xlnd") (define %tinycc-seed (let ((commit "a39d918b3fd9d8b07d981d69e3af88733efa54c1"))
106/163: Revert: gnu: binutils-boot0: Inject AR, LD from bootstrap-binaries.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 7190b655ca530e60098b784e7df5df1f7a946d2d Author: Jan Nieuwenhuizen Date: Sun Jun 24 20:31:17 2018 +0200 Revert: gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries. * gnu/packages/mes.scm (binutils-boot0): Revert: Inject AR,LD from bootstrap binaries. --- gnu/packages/mes.scm | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 2e9b668..696f589 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -707,13 +707,7 @@ standard.") "--disable-werror" "--host=i386-unknown-linux" "--target=i386-unknown-linux" - (string-append "--prefix=" out))) - (add-after 'build 'cheat:inject-AR,LD - (lambda* _ - (let ((binutils (assoc-ref %build-inputs "binutils"))) - ;; cheat: AR and LD are buggy in bootstrap build - (copy-file (string-append binutils "/bin/ar") "binutils/ar") - (copy-file (string-append binutils "/bin/ld") "ld/ld-new") + (string-append "--prefix=" out (define-public binutils-mesboot (package-with-bootstrap-guile
69/163: gnu: gcc-boot: Update to 2.6.3.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 2372bb5ff2d53dc8c12b0512b7ad89fc451983e2
Author: Jan Nieuwenhuizen
Date: Sun Jun 3 17:31:27 2018 +0200
gnu: gcc-boot: Update to 2.6.3.
* gnu/packages/mes.scm (gcc-boot): Update to 2.6.3.
* gnu/packages/patches (gcc-boot-2.6.3.patch): New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/mes.scm | 97 ++--
gnu/packages/patches/gcc-boot-2.6.3.patch | 397 ++
3 files changed, 470 insertions(+), 25 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a2e5385..57c7e1b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -696,6 +696,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-asan-missing-include.patch \
+ %D%/packages/patches/gcc-boot-2.6.3.patch\
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 8f0cc51..48fec16 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -40,7 +40,8 @@
#:use-module (guix git-download)
#:use-module (guix licenses)
#:use-module (guix packages)
- #:use-module (guix utils))
+ #:use-module (guix utils)
+ #:use-module (guix gexp))
(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up?
@@ -592,33 +593,79 @@ standard.")
(define-public gcc-boot
(package
-;; (inherit gcc-4.7)
-(source (package-source gcc-4.7))
+(inherit gcc)
(name "gcc-boot")
-(version "4.7.4")
-(synopsis (package-synopsis gcc-4.7))
+(version "2.6.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"https://gcc.gnu.org/pub/gcc/old-releases/gcc-2/gcc-;
+ version ".tar.bz2"))
+ ;; tarball contains read-only sources
+ ;; (patches (search-patches "gcc-boot.patch"))
+ (sha256
+ (base32
+"0h61wd59fbk02pprlxsj67ph8rqw4avfr8bbp85g5isdky277xki"
(supported-systems '("i686-linux"))
-(build-system gnu-build-system)
-(native-inputs `(("tcc" ,tcc-boot)))
-(inputs `(;;("gmp" ,gmp)
- ;;("mpfr" ,mpfr)
- ;;("mpc" ,mpc)
- ;;("libelf" ,libelf)
- ;;("zlib" ,zlib)
- ))
+(native-inputs `(;;("binutils" ,binutils-boot)
+ ,(let ((triplet "i686-unknown-linux-gnu")) ;; MORTAL SIN
HERE
+`("binutils" ,(cross-binutils triplet)))
+ ("mes" ,mes-boot)
+ ("tcc" ,tcc-boot)
+ ("patch" ,(local-file (car (search-patches
"gcc-boot.patch"))
+(outputs '("out"))
(arguments
- `(;;#:out-of-source? #t
- #:configure-flags `("--enable-languages=c"
- "--disable-multilib"
- ;;,(string-append "CC='mes-tcc " (assoc-ref
%build-inputs "tcc") "/lib/crt1.mlibc-o'")
- "CC=mes-tcc"
- "CFLAGS=-static"
- "XAR='mes-tcc -ar"
- "MAKEINFO=missing")))
-(properties `((gcc-libc . ,(assoc-ref inputs "libc"
-(home-page (package-home-page gcc-4.7))
-(description (package-description gcc-4.7))
-(license (package-license gcc-4.7
+ `(#:tests? #f ; runtest: command not found
+ #:strip-binaries? #f
+ #:make-flags '("CC=tcc -static"
+ "LANGUAGES=c"
+ "ALLOCA=alloca.o"
+ "CC=tcc -static"
+ "OLDCC=tcc -static")
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-1))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chmod
+ (lambda _
+ (let ((patch (assoc-ref %build-inputs "patch")))
+ (format #t "hiero: ~s\n" (getcwd))
+ (system* "ls" "-ltrF")
+ (system* "chmod" "-R" "+w" ".")
+ (system* &q
157/163: Revert "gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball."
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 5d774f21bf4a38d030291bd53ed00f828aa534fa
Author: Jan Nieuwenhuizen
Date: Tue Aug 28 01:18:57 2018 +0200
Revert "gnu: Add %make-static, %make-static-stripped,
%make-bootstrap-tarball."
This reverts commit 1c514faec326123fd1c45c40c74623a540e08a77.
---
gnu/packages/make-bootstrap.scm | 55 -
1 file changed, 55 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index cb3e8d4..f7b95c8 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -41,7 +41,6 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:export (%bootstrap-binaries-tarball
-%make-bootstrap-tarball
%linux-libre-headers-bootstrap-tarball
%binutils-bootstrap-tarball
%glibc-bootstrap-tarball
@@ -302,56 +301,6 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(license gpl3+)
(home-page #f)))
-(define %make-static
- ;; Statically-linked Make.
- (package
-(inherit gnu-make)
-(name "make-static")
-(arguments
- `(#:strip-flags '("--strip-all")
- #:configure-flags (cons "--without-guile"
- ,(match (memq #:configure-flags
- (package-arguments binutils))
- ((#:configure-flags flags _ ...)
- flags)))
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'all-static
-(lambda _
- ;; The `-all-static' libtool flag can only be passed
- ;; after `configure', since configure tests don't use
- ;; libtool, and only for executables built with libtool.
- (substitute* '("Makefile.in")
-(("^LDFLAGS =(.*)$" line)
- (string-append line
-"\nAM_LDFLAGS = -static\n"))
-
-(define %make-static-stripped
- ;; The subset of Make that we need.
- (package (inherit %make-static)
-(name (string-append (package-name %make-static) "-stripped"))
-(build-system trivial-build-system)
-(outputs '("out"))
-(arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
-
- (setvbuf (current-output-port) _IOLBF)
- (let* ((in (assoc-ref %build-inputs "make"))
-(out (assoc-ref %outputs "out"))
-(bin (string-append out "/bin")))
- (mkdir-p bin)
- (for-each (lambda (file)
- (let ((target (string-append bin "/" file)))
- (format #t "copying `~a'...~%" file)
- (copy-file (string-append in "/bin/" file)
-target)
- (remove-store-references target)))
- '("make"))
- #t
-(inputs `(("make" ,%make-static)
-
(define %linux-libre-headers-stripped
;; The subset of Linux-Libre-Headers that we need.
(package (inherit linux-libre-headers)
@@ -723,10 +672,6 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
;; A tarball with the statically-linked bootstrap binaries.
(tarball-package %static-binaries))
-(define %make-bootstrap-tarball
- ;; A tarball with the statically-linked Make programs.
- (tarball-package %make-static-stripped))
-
(define %linux-libre-headers-bootstrap-tarball
;; A tarball with the statically-linked Linux-Libre-Headers programs.
(tarball-package %linux-libre-headers-stripped))
105/163: gnu: binutils-mesboot: Rename from binutils-boot.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 07ed8418e28ca7476bffa5d5d95154158247081b
Author: Jan Nieuwenhuizen
Date: Sat Jun 23 19:46:39 2018 +0200
gnu: binutils-mesboot: Rename from binutils-boot.
* gnu/packages/mes.scm (binutils-mesboot): Rename from binutils-boot.
---
gnu/packages/mes.scm | 90 ++--
1 file changed, 60 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index deb8085..2e9b668 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -715,36 +715,66 @@ standard.")
(copy-file (string-append binutils "/bin/ar") "binutils/ar")
(copy-file (string-append binutils "/bin/ld")
"ld/ld-new")
-(define-public binutils-boot
- (package
-(inherit binutils-boot0)
-(name "binutils-boot")
-(native-inputs `(("flex" ,flex) ; cheat
- ("glibc" ,glibc-boot)
- ("gcc" ,gcc-boot)))
-(arguments
- `(#:tests? #f ; runtest: command not found
- #:parallel-build? #f
- #:strip-binaries? #f
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
-(glibc (assoc-ref %build-inputs "glibc")))
- (setenv "C_INCLUDE_PATH" (string-append glibc "/include"))
- (unsetenv "LIBRARY_PATH" (string-append glibc "/lib"))
- (setenv "CONFIG_SHELL" (string-append
- (assoc-ref %build-inputs "bash")
- "/bin/sh"))
- (and (zero?
- (system* "./configure"
- "--disable-nls"
- "--disable-shared"
- "--disable-werror"
- "--host=i386-unknown-linux"
- "--target=i386-unknown-linux"
- (string-append "--prefix=" out
+(define-public binutils-mesboot
+ (package-with-bootstrap-guile
+ (package
+ (inherit binutils-mesboot0)
+ (name "binutils-mesboot")
+ (native-inputs `(("binutils-mesboot" ,binutils-mesboot0)
+ ("glibc-mesboot" ,glibc-mesboot)
+ ("gcc-mesboot" ,gcc-mesboot)
+ ("kernel-headers" ,(linux-libre-headers-boot0
+ (arguments
+ `(#:parallel-build? #f
+#:configure-flags '("--enable-deterministic-archives"
+"--disable-nls"
+"--disable-shared"
+"--disable-werror"
+"--host=i386-unknown-linux"
+"--target=i386-unknown-linux"
+"--enable-static"
+"--enable-compressed-debug-sections=no"
+"--disable-gold"
+"--disable-plugins"
+"--disable-x86-relax-relocations"
+"--with-system-libz")
+#:phases
+(modify-phases %standard-phases
+ (add-before 'configure 'setenv
+(lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+(gcc (assoc-ref %build-inputs "gcc-mesboot"))
+(glibc (assoc-ref %build-inputs "glibc-mesboot"))
+(kernel-headers (assoc-ref %build-inputs
"kernel-headers")))
+(setenv "C_INCLUDE_PATH"
+(string-append glibc "/include"
+ ":" kernel-headers "/include"
+ ":" gcc "/include"))
+(setenv "LIBRARY_PATH"
+(string-append glibc "/lib"
+ ":" gcc "/lib"))
+(setenv "CPP" (string-append "gcc -E"))
+(setenv "AR" "ar")
+(setenv "RANLIB" "true")
+(setenv "PATH"
+(string-append
+ (assoc-ref %build-inputs "binutils-mesboot")
96/163: gnu: Add binutils-boot0-cheat.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit de4e174dd2a855075536ea7ef7b9f6aa424c0927
Author: Jan Nieuwenhuizen
Date: Sat Jun 23 13:26:32 2018 +0200
gnu: Add binutils-boot0-cheat.
* gnu/packages/mes.scm (binutils-boot0-cheat): New variable.
(%cheat-binutils?): New variable.
---
gnu/packages/mes.scm | 102 +++
1 file changed, 94 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index f1c3c7f..2a78445 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -44,6 +44,7 @@
#:use-module (guix gexp))
(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up?
+(define %cheat-binutils? #t) ; cheat using binutils-boot0 compiled with
current tool-chain
(define %mescc-tools-seed
(let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb"))
@@ -633,12 +634,13 @@ standard.")
(system* "./configure"
(string-append "--prefix=" out)))
-(define-public binutils-boot0
+(define-public binutils-boot0-real
(package
(inherit binutils)
-(name "binutils-boot0")
-(version "2.20.1a")
-(source (origin
+(name (if %cheat-binutils? "binutils-boot0-real"
+ "binutils-boot0"))
+ (version "2.20.1a")
+ (source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/binutils/binutils-"
version ".tar.bz2"))
@@ -709,9 +711,95 @@ standard.")
"--target=i386-unknown-linux"
(string-append "--prefix=" out
+(define-public binutils-boot0-cheat
+ (let* ((triplet "i686-unknown-linux-gnu")
+ (tool-prefix (string-append triplet "-")))
+(package
+ (inherit binutils-boot0-real)
+ (name (if %cheat-binutils? "binutils-boot0"
+"binutils-boot0-cheat"))
+ (supported-systems '("i686-linux"))
+ (native-inputs `(("flex" ,flex) ; cheat
+ ("binutils" ,(cross-binutils triplet))
+ ("gcc" ,(cross-gcc triplet))
+ ("glibc" ,(cross-libc triplet))
+ ("kernel-headers" ,(linux-libre-headers-boot0
+ (arguments
+ `(#:tests? #f; runtest: command not found
+ #:parallel-build? #f
+ #:strip-binaries? #f
+ #:make-flags (list "RANLIB=true")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (glibc (assoc-ref %build-inputs "glibc"))
+ (headers (assoc-ref %build-inputs "kernel-headers"))
+ (cppflags (string-append " --static -static"
+" -D MES_BOOTSTRAP=1"
+" -B " glibc "/lib"
+" -I " glibc "/include"
+" -I " headers "/include"))
+ (ldflags (string-append " --static -static"
+ " -B " glibc "/lib")))
+ (setenv "C_INCLUDE_PATH"
+ (string-append glibc "/include"
+":" headers "/include"))
+ (setenv "LIBRARY_PATH"
+ (string-append glibc "/lib"))
+ (setenv "PATH"
+ (string-append
+ (assoc-ref %build-inputs "flex") "/bin"
+ ":" (assoc-ref %build-inputs "gcc") "/bin"
+ ":" (assoc-ref %build-inputs "binutils") "/"
,triplet "/bin"
+
+ ;; more bootstrap cheats
+ ":" (assoc-ref %build-inputs "bash") "/bin"
+ ":" (assoc-ref %build-inputs "bzip2") "/bin"
+ ":" (assoc-ref %build-inputs "coreutils") "/bin"
+ ":" (assoc-ref %build-inputs "diffutils") "/bin"
+ ;;":" (assoc-ref %build
123/163: gnu: binutils-mesboot0: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ccb93bb57fd03eccd0c056cb8240ec7e48506caa
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 20:00:43 2018 +0200
gnu: binutils-mesboot0: Revise dependencies.
* gnu/packages/mes.scm (binutils-mesboot0): Revise dependencies.
---
gnu/packages/mes.scm | 146 +--
1 file changed, 71 insertions(+), 75 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index a8a01b0..0abc50a 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -612,81 +612,77 @@ standard.")
(define-public binutils-mesboot0
(package-with-bootstrap-guile
- (package
- (inherit binutils)
- (name "binutils-mesboot0")
- (version "2.20.1a")
- (source (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"
- (supported-systems '("i686-linux"))
- (native-inputs `(("flex" ,flex) ; cheat
- ("mes" ,mes-boot)
- ("tcc" ,tcc-boot)))
- (arguments
- `(#:tests? #f ; runtest: command not found
-#:parallel-build? #f
-#:strip-binaries? #f
-#:make-flags '("AR=tcc -ar" "RANLIB=true")
-#:phases
-(modify-phases %standard-phases
- (replace 'configure
-(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
-(cppflags (string-append
- " -D __STDC__=1 "
- " -D __GLIBC_MINOR__=6"
- " -D MES_BOOTSTRAP=1")))
-(unsetenv "C_INCLUDE_PATH") ; flex
-(unsetenv "CPLUS_INCLUDE_PATH") ; flex
-(unsetenv "CPATH") ; flex
-(unsetenv "LIBRARY_PATH") ; flex
-(setenv "PATH"
-(string-append
- (assoc-ref %build-inputs "flex") "/bin"
- ":" (assoc-ref %build-inputs "tcc") "/bin"
- ":" (assoc-ref %build-inputs "mes") "/bin"
-
- ;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "bzip2") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ":" (assoc-ref %build-inputs "gawk") "/bin"
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ":" (assoc-ref %build-inputs "sed") "/bin"
- ":" (assoc-ref %build-inputs "tar") "/bin"))
-
-(setenv "CONFIG_SHELL" (string-append
-(assoc-ref %build-inputs "bash")
-"/bin/sh"))
-(setenv "CPPFLAGS" cppflags)
-(setenv "AR" "tcc -ar")
-(setenv "CXX" "false")
-(setenv "RANLIB" "true")
-(setenv "CC" (string-append "tcc -static" " " cppflags))
-(setenv "LD" (string-append "tcc -static" " " cppflags))
-(setenv "CC_FOR_BUILD" (string-append "tcc -static" " "
cppflags))
-(setenv "CPP" (string-append "tcc -E" " " cppflags))
-(setenv "CC_FOR_BUILD" (string-append "tcc -static" " "
cppflags))
-(setenv "OBJC" (string-append "tcc -static" " " cppflags))
-(and
- (zero?
- (system* "./con
93/163: gnu: Add tcc-boot 0.9.27.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit cc98215c3f9a7bbfe30207a1b24250ad000d75ce
Author: Jan Nieuwenhuizen
Date: Sun Jun 17 23:32:04 2018 +0200
gnu: Add tcc-boot 0.9.27.
* gnu/packages/mes.scm (tcc-boot0): Rename from tcc-boot.
(tcc-boot): New package.
* gnu/packages/patches/tcc-boot-0.9.27.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/mes.scm | 101 +++--
gnu/packages/patches/tcc-boot-0.9.27.patch | 26
3 files changed, 123 insertions(+), 5 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 262c300..7554e9b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1154,6 +1154,7 @@ dist_patch_DATA =
\
%D%/packages/patches/t1lib-CVE-2011-1552+.patch \
%D%/packages/patches/tar-remove-wholesparse-check.patch \
%D%/packages/patches/tar-skip-unreliable-tests.patch \
+ %D%/packages/patches/tcc-boot-0.9.27.patch \
%D%/packages/patches/tclxml-3.2-install.patch\
%D%/packages/patches/tcsh-fix-autotest.patch \
%D%/packages/patches/tcsh-fix-out-of-bounds-read.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index c003989..ffb32c9 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -374,13 +374,13 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(home-page "https://savannah.nongnu.org/projects/nyacc;)
(license (list gpl3+ lgpl3+)
-(define-public tcc-boot
+(define-public tcc-boot0
(let ((version "0.9.26")
-(revision "0")
-(commit "97196cebf6c5c79ec87f1ee4875cc8c188333a3c"))
+(revision "1")
+(commit "c73a151c4d0878f387de0c87ec77484626a7a888"))
(package-with-bootstrap-guile
(package
- (name "tcc-boot")
+ (name "tcc-boot0")
(version (string-append version "-" revision "." (string-take commit
7)))
(synopsis "Tiny and fast C compiler")
(source (origin
@@ -390,7 +390,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
"/tinycc-" commit ".tar.gz"))
(sha256
(base32
- "1z156jfnc0dkdb6i9h0nns4hm11c03k3vakw7qhb7651dm8hqxrk"
+ "0sxvdj06a21a4a305k0pz4nb36vrcdjqv9xsb8dm06a8j1iqjkx9"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -512,6 +512,97 @@ standard.")
(home-page "http://www.tinycc.org/;)
(license lgpl2.1+)
+(define-public tcc-boot
+ (package
+(inherit tcc-boot0)
+(name "tcc-boot")
+(version "0.9.27")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://savannah/tinycc/tcc-"
+ version ".tar.bz2"))
+ (patches (search-patches "tcc-boot-0.9.27.patch"))
+ (sha256
+ (base32
+"177bdhwzrnqgyrdv1dwvpd04fcxj68s5pm1dzwny6359ziway8yy"
+ (build-system trivial-build-system)
+ (supported-systems '("i686-linux" "x86_64-linux"))
+
+ (native-inputs
+`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
+ ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
+ ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+ ("mes" ,mes-boot)
+ ("tcc" ,tcc-boot0)))
+ (arguments
+`(#:modules ((guix build utils))
+ #:builder
+ (begin
+(use-modules (guix build utils))
+(let* ((bash (assoc-ref %build-inputs "static-bash"))
+ (tar (assoc-ref %build-inputs "tar"))
+ (xz (assoc-ref %build-inputs "xz"))
+ (source (assoc-ref %build-inputs "source"))
+ (mes (assoc-ref %build-inputs "mes"))
+ (tcc (assoc-ref %build-inputs "tcc"))
+ (out (assoc-ref %outputs "out"))
+ (libc (assoc-ref %build-inputs "libc"))
+ (interpreter (if libc
+(string-append libc
,(glibc-dynamic-linker))
+(string-append mes "/lib/mes-loader"
+ ;; unpack
+ (setenv
139/163: gnu: Add %bootstrap-make.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit cc60acb3fe76e0cff5a75617b6e88abdcee18b8f
Author: Jan Nieuwenhuizen
Date: Thu Aug 23 21:58:41 2018 +0200
gnu: Add %bootstrap-make.
* gnu/packages/bootstrap.scm (%bootstrap-make): New variable.
---
gnu/packages/bootstrap.scm | 18 ++
1 file changed, 18 insertions(+)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 70d6f13..54bcd10 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -43,6 +43,7 @@
%bootstrap-guile
%bootstrap-coreutils
+%bootstrap-make
%bootstrap-binutils
%bootstrap-gcc
%bootstrap-glibc
@@ -395,6 +396,23 @@ $out/bin/guile --version~%"
(("^exec grep") (string-append (getcwd)
"/bin/grep"
(chmod "bin" #o555
+(define-public %bootstrap-make
+ (package-from-tarball
+ "make-bootstrap"
+ (lambda (system)
+ (origin
+ (method url-fetch)
+ (uri (match system
+ ((or "i686-linux"
+ "x86_64-linux")
+
"http://lilypond.org/janneke/mes/make-static-stripped-4.2.1-i686-linux.tar.xz;)
+ (_ (error "make-bootstrap: system not supported"
+ (sha256
+(base32
+ "0gb49ypzrw95cnhk8g5dzy8jql3k7axsgs87zbb5x8yxx7ckskar"
+ "make" ; the program to test
+ "Bootstrap binary GNU Make"))
+
(define %bootstrap-binutils
(package-from-tarball "binutils-bootstrap"
(lambda (system)
125/163: gnu: glibc-mesboot: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 0d0513e2cf461059b4b9c7d2107bddaf58019dc1
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 21:07:22 2018 +0200
gnu: glibc-mesboot: Revise dependencies.
* gnu/packages/mes.scm (glibc-mesboot): Revise dependencies.
---
gnu/packages/mes.scm | 25 +++--
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 7cec7a4..af96101 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -818,9 +818,14 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"
(supported-systems '("i686-linux"))
+ (inputs '())
(native-inputs `(("binutils" ,binutils-mesboot0)
("gcc" ,gcc-core-mesboot)
- ("kernel-headers" ,(linux-libre-headers-boot0
+
+ ("bootstrap-coreutils" ,%bootstrap-coreutils)
+ ("diffutils-boot0" ,(@@ (gnu packages commencement)
diffutils-boot0))
+ ("kernel-headers" ,(linux-libre-headers-boot0))
+ ("make-boot0" ,(@@ (gnu packages commencement)
gnu-make-boot0
(outputs '("out"))
(arguments
`(#:tests? #f
@@ -856,24 +861,16 @@ ac_cv_c_float_format='IEEE (little-endian)'
" -D BOOTSTRAP_GLIBC=1"))
(cflags (string-append " -L " (getcwd
(setenv "CONFIG_SHELL" (string-append
-(assoc-ref %build-inputs "bash")
+(assoc-ref %build-inputs
"bootstrap-coreutils")
"/bin/sh"))
(setenv "PATH"
(string-append
- (assoc-ref %build-inputs "binutils") "/bin"
+ (assoc-ref %build-inputs "bootstrap-coreutils") "/bin"
+ ":" (assoc-ref %build-inputs "binutils") "/bin"
":" (assoc-ref %build-inputs "gcc") "/bin"
-
- ;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ":" (assoc-ref %build-inputs "gawk") "/bin"
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ":" (assoc-ref %build-inputs "sed") "/bin"
- ":" (assoc-ref %build-inputs "tar") "/bin"))
+ ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin"
+ ":" (assoc-ref %build-inputs "make-boot0") "/bin"))
(setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags))
(setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
136/163: gnu: tcc-boot0: Use gnu-build-system.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 7f4bca3f646d2d67beec6d0f07c623700f68fa19
Author: Jan Nieuwenhuizen
Date: Thu Aug 23 20:38:29 2018 +0200
gnu: tcc-boot0: Use gnu-build-system.
* gnu/packages/mes.scm (tcc-boot0): Use gnu-build-system.
---
gnu/packages/mes.scm | 193 ++-
1 file changed, 98 insertions(+), 95 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 5ca693b..c357d47 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -360,7 +360,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(sha256
(base32
"0jkv9shhn5s4zqsvnjwwp2np2wg5v8ypsj5s4hb8yr1cjqqv2z9s"
- (build-system trivial-build-system)
+ (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
`(("coreutils" , %bootstrap-coreutils)
@@ -374,106 +374,109 @@ extensive examples, including parsers for the
Javascript and C99 languages.")
("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43;
cherry-pick
'(
(arguments
-`(#:modules ((guix build utils))
- #:builder
- (begin
-(use-modules (guix build utils))
-(let* ((coreutils (assoc-ref %build-inputs "coreutils"))
- (mes (assoc-ref %build-inputs "mes"))
- (guile (assoc-ref %build-inputs "guile"))
- (srfi-43 (assoc-ref %build-inputs "srfi-43"))
- (mescc-tools (assoc-ref %build-inputs "mescc-tools"))
- (source (assoc-ref %build-inputs "source"))
- (nyacc-source (assoc-ref %build-inputs "nyacc-source"))
- (mes-seed (assoc-ref %build-inputs "mes-seed"))
- (tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))
- (out (assoc-ref %outputs "out"))
- (libc (assoc-ref %build-inputs "libc"))
- (interpreter (if libc
-(string-append libc
,(glibc-dynamic-linker))
-(string-append mes "/lib/mes-loader")))
- (dir (getcwd)))
- ;; unpack
- (setenv "PATH" (string-append
- coreutils "/bin"
- ":" mes "/bin"
- (if guile (string-append ":" guile "/bin")
- "")
- ":" mescc-tools "/bin"))
- (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
- (mkdir-p "source")
- (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
- (mkdir-p "nyacc-source")
- (system* "tar" "--strip=1" "-C" "nyacc-source" "-xvf"
nyacc-source)
- (mkdir-p "mes-seed")
- (system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
- (mkdir-p "tinycc-seed")
- (system* "tar" "--strip=1" "-C" "tinycc-seed" "-xvf" tinycc-seed)
- (when srfi-43
-(mkdir-p "srfi")
-(system* "cp" srfi-43 "srfi/srfi-43.scm"))
- (chdir "source")
-
- ;; configure
- (setenv "PREFIX" out)
- (setenv "MESCC" (string-append mes "/bin/mescc"))
- (symlink (string-append mes "/share/mes") "mes")
- (setenv "MES_PREFIX" "mes")
- (setenv "OBJDUMP" "true")
- (setenv "ONE_SOURCE" "1")
- (setenv "PREPROCESS" "1")
- (setenv "MES_DEBUG" "1")
- (setenv "MES_ARENA" "7000")
- (setenv "MES_MAX_ARENA" "7000")
-
- (if ,%fake-bootstrap?
- (begin ; Cheat using Guile+Nyacc+MesCC; ~30 times faster
-(setenv "MES" "guile")
-(setenv "GUILE_AUTO_COMPILE" "1")
-(setenv "GUILE_LOAD_COMPILED_PATH"
-(string-append guile &qu
143/163: gnu: Add %bootstrap-linux-libre-headers.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 2875c8864c4c142a37e63f17367b8f3c4478095f Author: Jan Nieuwenhuizen Date: Sat Aug 25 09:35:37 2018 +0200 gnu: Add %bootstrap-linux-libre-headers. * gnu/packages/bootstrap.scm (%bootstrap-linux-libre-headers): New variable. --- gnu/packages/bootstrap.scm | 18 ++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index d4904c1..d6b9901 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -44,6 +44,7 @@ %bootstrap-guile %bootstrap-coreutils %bootstrap-diffutils +%bootstrap-linux-libre-headers %bootstrap-make %bootstrap-binutils %bootstrap-gcc @@ -475,6 +476,23 @@ $out/bin/guile --version~%" "make" ; the program to test "Bootstrap binary GNU Make")) +(define-public %bootstrap-linux-libre-headers + (package-from-tarball-possibly-without-test + "linux-libre-headers-bootstrap" + (lambda (system) + (origin + (method url-fetch) + (uri (match system + ((or "i686-linux" + "x86_64-linux") + "http://lilypond.org/janneke/mes/linux-libre-headers-stripped-4.4.47-i686-linux.tar.xz;) + (_ (error "linux-libre-headers-bootstrap: system not supported" + (sha256 +(base32 + "1pfrnl2mk52hk39ykrbjn4jqmxq6av0h650xw3asm9faacyw0f4s" + #f ; no program to test + "Bootstrap linux-libre-headers")) + (define %bootstrap-binutils (package-from-tarball "binutils-bootstrap" (lambda (system)
22/163: gnu: Update mescc-tools-boot: bootstrap from .M1 sources: remove MORTAL SIN.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 18ccf55b686823c30a113f028f9d931b687fe77a
Author: Jan Nieuwenhuizen
Date: Tue Nov 28 20:07:25 2017 +0100
gnu: Update mescc-tools-boot: bootstrap from .M1 sources: remove MORTAL SIN.
* gnu/packages/mes.scm (mescc-tools-boot): Update mescc-tools-seed:
bootstrap
from .M1 sources: remove MORTAL SIN.
---
gnu/packages/mes.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0a5cc03..66408e2 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -141,11 +141,11 @@ with a Knight VM that runs Forth and Lisp.")
(method url-fetch)
(uri (string-append "https://gitlab.com/janneke/mescc-tools-seed;
"/repository/archive.tar.gz?ref="
- "b0f8fd0e31c41cb91aefd17047da1f5743370e4b"))
+ "f59808fc39ddd9ca7dc044b378155dcbb0cca337"))
(file-name (string-append "mescc-tools-seed" "-" version
".tar.xz"))
(sha256
(base32
-"065nmxpp73hnynqil0f1d3cgldkfpx64zach1i31iz05f9xy3yzn"
+"0rn08hw6r6q9lqp2vlmy0p1jyfwfz81zfpdg09dsc5hzj7s4gar4"
("mes-source" ,(package-source mes-boot))
("mes-seed"
,(origin
62/163: gnu: Add binutils-boot 2.5.1.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 1f1e76e1f8646e958b82ec23ac0bc8514487cfb7
Author: Jan Nieuwenhuizen
Date: Fri Jun 1 14:17:29 2018 +0200
gnu: Add binutils-boot 2.5.1.
* gnu/packages/mes.scm (binutils-boot): New variable.
---
gnu/local.mk | 1 +
gnu/packages/mes.scm | 50
gnu/packages/patches/binutils-boot.patch | 207 +++
3 files changed, 258 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index a2e5385..502413f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -594,6 +594,7 @@ dist_patch_DATA =
\
%D%/packages/patches/bazaar-CVE-2017-14176.patch \
%D%/packages/patches/beignet-correct-file-names.patch\
%D%/packages/patches/binutils-aarch64-symbol-relocation.patch\
+ %D%/packages/patches/binutils-boot.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/blast+-fix-makefile.patch \
%D%/packages/patches/boost-fix-icu-build.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0c5aea7..494f4fb 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -540,6 +540,56 @@ standard.")
(system* "./configure"
(string-append "--prefix=" out)))
+(define-public binutils-boot
+ (package
+(inherit binutils)
+(name "binutils-boot")
+(version "2.5.1")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
"https://gcc.gnu.org/pub/binutils/old-releases/binutils-;
+ version ".tar.bz2"))
+ (patches (search-patches "binutils-boot.patch"))
+ (sha256
+ (base32
+"0nbhihxikyj5zg4fkf9gqx9b2rd1s47pid30rk8z8dvkvgpbmsin"
+(supported-systems '("i686-linux"))
+(native-inputs `(("mes" ,mes-boot)
+ ("tcc" ,tcc-boot)))
+(arguments
+ `(#:tests? #f ; runtest: command not found
+ #:strip-binaries? #f
+ #:make-flags '("CC=tcc -static -DANSI_PROTOTYPES=1"
+ "AR=tcc -ar"
+ "RANLIB=true")
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-1))
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (setenv "CONFIG_SHELL" (string-append
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh"))
+ (setenv "CPPFLAGS" "-D ANSI_PROTOTYPES=1")
+ (setenv "AR" "tcc -ar")
+ (setenv "RANLIB" "true")
+ (setenv "CC" "tcc -static -D ANSI_PROTOTYPES=1")
+ (setenv "CPP" "tcc -E -D ANSI_PROTOTYPES=1")
+ (and
+(zero?
+ (system* "./configure"
+ "--host=i386-unknown-linux"
+ "--target=i386-unknown-linux"
+ (string-append "--prefix=" out)))
+(with-directory-excursion "gas"
+ (zero?
+ (system* "./configure"
+"--host=i386-unknown-linux"
+"--target=i386-unknown-linux"
+
(define-public gcc-boot
(package
;; (inherit gcc-4.7)
diff --git a/gnu/packages/patches/binutils-boot.patch
b/gnu/packages/patches/binutils-boot.patch
new file mode 100644
index 000..fc235a5
--- /dev/null
+++ b/gnu/packages/patches/binutils-boot.patch
@@ -0,0 +1,207 @@
+diff -purN -x BOOT ../binutils-2.5.1/bfd/elfcode.h binutils-2.5.1/bfd/elfcode.h
+--- ../binutils-2.5.1/bfd/elfcode.h1994-10-22 02:28:00.0 +0100
binutils-2.5.1/bfd/elfcode.h 2018-05-31 18:16:42.317716523 +0200
+@@ -430,8 +430,7 @@ elf_swap_dyn_out (abfd, src, dst)
+ /* String table creation/manipulation routines */
+
+ static struct strtab *
+-bfd_new_strtab (abfd)
+- bfd *abfd;
++bfd_new_strtab ()
+ {
+ struct strtab *ss;
+
+diff -purN -x BOOT ../binutils-2.5.1/binutils/bucomm.c
binutils-2.5.1/binutils/bucomm.c
+--- ../binutils-2.5.1/binutils/bucomm.c1994-09-16 06:03:34.0
+0200
binutils-2.5.1/binutils/bucomm.c 2018-05-31 18:19:33.880540023 +0200
+@@ -31,6 +31,8 @@
+ #in
61/163: gnu: Add m4-boot.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit e1eef46b9cb1cd7328065e9448460071c03bdae5
Author: Jan Nieuwenhuizen
Date: Mon May 28 19:13:38 2018 +0200
gnu: Add m4-boot.
* gnu/packages/mes.scm (m4-boot): New variable.
---
gnu/packages/mes.scm | 38 --
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index d4e7320..0c5aea7 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -27,6 +27,7 @@
#:use-module (gnu packages gcc)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages guile)
+ #:use-module (gnu packages m4)
#:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages man)
#:use-module (gnu packages package-management)
@@ -37,7 +38,8 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix licenses)
- #:use-module (guix packages))
+ #:use-module (guix packages)
+ #:use-module (guix utils))
(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up?
@@ -508,11 +510,35 @@ standard.")
(home-page "http://www.tinycc.org/;)
(license lgpl2.1+)
-;; gcc-boot
-;; what I did was just this [19:11]
-;; MAKEINFO=missing CC=tcc $HOME/gcc-4.7.4/configure
-;; --prefix=$HOME/gcc-out --enable-languages=c --disable-multilib
-;; with tcc built and installed in $PATH
+(define-public m4-boot
+ (package
+(inherit m4)
+(name "m4-boot")
+(version "1.4")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/m4/m4-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+"1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw"
+(supported-systems '("i686-linux"))
+(native-inputs `(("mes" ,mes-boot)
+ ("tcc" ,tcc-boot)))
+(arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (setenv "CONFIG_SHELL" (string-append
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh"))
+ (setenv "CC" "tcc -static")
+ (setenv "CPP" "tcc -E")
+ (zero?
+(system* "./configure"
+ (string-append "--prefix=" out)))
(define-public gcc-boot
(package
49/163: gnu: %mes-seed: Update for mes 0.14.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 54a20a4c3612db49593fd84046892dc35fe44a95 Author: Jan Nieuwenhuizen Date: Thu May 3 12:00:07 2018 +0200 gnu: %mes-seed: Update for mes 0.14. * gnu/packages/mes.scm (%mes-seed): Update for mes 0.14. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 7ab26e9..d1ea1f0 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -51,7 +51,7 @@ "1mc4vdf2m6airq8rhy3w14rq9qq00ihf21lcvpvqjaifhj8856y1") (define %mes-seed - (let ((commit "d24ab2f8bd57579afebf59e5b672680642c470bd")) + (let ((commit "86e555fe9e58529b8ee2dd819f233c6e2dba063b")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes-seed; @@ -59,7 +59,7 @@ "/mes-seed-" commit ".tar.gz")) (sha256 (base32 -"0yjw2pp87dgmgk6qz04r0f72jfs67c356a4isc9v7v9zzgni6ihw") +"11ixdy0a979lsnwbvpf12mhjd0l76gnpbk3wlpsja681ld0xh4g3") (define %tinycc-seed (let ((commit "c6c2dd26cc0743fb4877996ce340bf99a3e3714e"))
50/163: gnu: mes-boot: Update to 0.14.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8cf56aec7563ed8914f339eb5ae52bb428a4be3c
Author: Jan Nieuwenhuizen
Date: Thu May 3 12:00:33 2018 +0200
gnu: mes-boot: Update to 0.14.
* gnu/packages/mes.scm (mes-boot): Update to 0.14.
---
gnu/packages/mes.scm | 42 ++
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index d1ea1f0..250f2ef 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -222,9 +222,9 @@ hex2 linker.")
(license gpl3+)
(define-public mes-boot
- (let ((version "0.13")
+ (let ((version "0.14")
(revision "0")
-(commit "9aa04a854940aec2683c1cc62205cea6da6f02a2"))
+(commit "4e50490aa2513ced5b568f434b23ba36218ba7b3"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -237,7 +237,7 @@ hex2 linker.")
"/mes-" commit ".tar.gz"))
(sha256
(base32
- "065vlpjpwnzv7h7my39zb0f7bk2zrsh08g4m7si6p7m0330n3x2z"
+ "0ydsmkqb0sm1rhh83r0kyqv7664iw1ginvd52gp11mx7317qaldk"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -284,6 +284,8 @@ hex2 linker.")
(mkdir-p "srfi")
(system* "cp" srfi-43 "srfi/srfi-43.scm")
(chdir "source")
+
+ ;; configure
(setenv "PREFIX" out)
(when guile
(setenv "GUILE_AUTO_COMPILE" "1")
@@ -293,24 +295,32 @@ hex2 linker.")
(string-append "../nyacc-source/module"
":" dir
":" guile "/share/guile/2.0/")))
+
+ ;; guile-2.0 fails
+ (delete-file "tests/srfi-43.test-guile")
+
;; give auto-compile a home -- massive speed-up
(mkdir-p "/tmp/home")
(setenv "HOME" "/tmp/home")
+
+ (when (not guile)
+(symlink (string-append "../nyacc-source/module") "nyacc")
+(setenv "GUILE_LOAD_PATH" "nyacc")
+(setenv "MES" "src/mes")
+(setenv "GUILE" "true"))
+ (setenv "MESCC" "scripts/mescc")
+ (setenv "MES_MODULEDIR" "module")
(and
+ ;; build
(zero? (system* "sh" "build.sh"))
- (and
- (symlink (string-append "../nyacc-source/module") "nyacc")
- ;; guile-2.0 fails
- (delete-file "tests/srfi-43.test-guile")
- (when (not guile)
- (setenv "GUILE" "true"))
- (setenv "GUILE_LOAD_PATH" "nyacc")
- (setenv "MES" "src/mes")
- (setenv "MES_MODULEDIR" "module")
- (setenv "MESCC" "scripts/mescc")
- (zero? (system* "sh" "-x" "test.sh"))
- (zero? (system* "sh" "-x" "test.sh" "63-struct-cell"))
- (zero? (system* "sh" "check.sh")))
+
+ ;; check
+ (zero? (system* "sh" "-x" "build-aux/test.sh"))
+ (zero? (system* "sh" "-x" "build-aux/test.sh"
"scaffold/tests/63-struct-cell"))
+ (zero? (system* "sh" "check.sh"))
+
+ ;; install
+ (setenv "SHELL" (string-append bash "/bin/bash"))
(zero? (system* "sh" "install.sh")))
(description
"Mes [Maxwell Equations of Software] aims to create full source
124/163: gnu: gcc-core-mesboot: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f98e971b01f83f288a9c996af0f9e19682d2aec1
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 20:44:31 2018 +0200
gnu: gcc-core-mesboot: Revise dependencies.
* gnu/packages/mes.scm (gcc-core-mesboot): Revise dependencies.
---
gnu/packages/mes.scm | 21 +
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0abc50a..7cec7a4 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -700,7 +700,11 @@ standard.")
(base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
(supported-systems '("i686-linux"))
- (native-inputs `(("binutils" ,binutils-mesboot0)
+ (inputs '())
+ (native-inputs `(("bootstrap-coreutils" ,%bootstrap-coreutils)
+ ("binutils" ,binutils-mesboot0)
+ ("diffutils-boot0" ,(@@ (gnu packages commencement)
diffutils-boot0))
+ ("make-boot0" ,(@@ (gnu packages commencement)
gnu-make-boot0))
("tcc" ,tcc-boot)))
(outputs '("out"))
(arguments
@@ -737,23 +741,16 @@ standard.")
(assoc-ref %build-inputs "binutils") "/bin"
":" (assoc-ref %build-inputs "tcc") "/bin"
- ;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ":" (assoc-ref %build-inputs "file") "/bin"
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ":" (assoc-ref %build-inputs "sed") "/bin"
- ":" (assoc-ref %build-inputs "tar") "/bin"))
+ ":" (assoc-ref %build-inputs "bootstrap-coreutils")
"/bin"
+ ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin"
+ ":" (assoc-ref %build-inputs "make-boot0") "/bin"))
;; no info at this stage
(delete-file-recursively "texinfo")
(system "touch gcc/cpp.info gcc/gcc.info")
(setenv "CONFIG_SHELL" (string-append
-(assoc-ref %build-inputs "bash")
+(assoc-ref %build-inputs
"bootstrap-coreutils")
"/bin/sh"))
(unsetenv "LANG")
(unsetenv "C_INCLUDE_PATH") ; flex
138/163: gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 0a8298ed7c89a78981488483c20fd44f4cbf0285
Author: Jan Nieuwenhuizen
Date: Thu Aug 23 21:33:11 2018 +0200
gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball.
* gnu/packages/make-bootstrap.scm (%make-static, %make-static-stripped,
%make-bootstrap-tarball): New variable.
---
gnu/packages/make-bootstrap.scm | 56 +
gnu/packages/mes.scm| 2 +-
2 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 475749b..efef713 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2017 Efraim Flashner
;;; Copyright © 2018 Tobias Geerinckx-Rice
;;; Copyright © 2018 Mark H Weaver
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen
;;;
;;; This file is part of GNU Guix.
;;;
@@ -40,6 +41,7 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:export (%bootstrap-binaries-tarball
+%make-bootstrap-tarball
%binutils-bootstrap-tarball
%glibc-bootstrap-tarball
%gcc-bootstrap-tarball
@@ -299,6 +301,56 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(license gpl3+)
(home-page #f)))
+(define %make-static
+ ;; Statically-linked Make.
+ (package
+(inherit gnu-make)
+(name "make-static")
+(arguments
+ `(#:strip-flags '("--strip-all")
+ #:configure-flags (cons "--without-guile"
+ ,(match (memq #:configure-flags
+ (package-arguments binutils))
+ ((#:configure-flags flags _ ...)
+ flags)))
+ #:phases (modify-phases %standard-phases
+ (add-before 'configure 'all-static
+(lambda _
+ ;; The `-all-static' libtool flag can only be passed
+ ;; after `configure', since configure tests don't use
+ ;; libtool, and only for executables built with libtool.
+ (substitute* '("Makefile.in")
+(("^LDFLAGS =(.*)$" line)
+ (string-append line
+"\nAM_LDFLAGS = -static\n"))
+
+(define %make-static-stripped
+ ;; The subset of Make that we need.
+ (package (inherit %make-static)
+(name (string-append (package-name %make-static) "-stripped"))
+(build-system trivial-build-system)
+(outputs '("out"))
+(arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+
+ (setvbuf (current-output-port) _IOLBF)
+ (let* ((in (assoc-ref %build-inputs "make"))
+(out (assoc-ref %outputs "out"))
+(bin (string-append out "/bin")))
+ (mkdir-p bin)
+ (for-each (lambda (file)
+ (let ((target (string-append bin "/" file)))
+ (format #t "copying `~a'...~%" file)
+ (copy-file (string-append in "/bin/" file)
+target)
+ (remove-store-references target)))
+ '("make"))
+ #t
+(inputs `(("make" ,%make-static)
+
(define %binutils-static
;; Statically-linked Binutils.
(package (inherit binutils)
@@ -650,6 +702,10 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
;; A tarball with the statically-linked bootstrap binaries.
(tarball-package %static-binaries))
+(define %make-bootstrap-tarball
+ ;; A tarball with the statically-linked Make programs.
+ (tarball-package %make-static-stripped))
+
(define %binutils-bootstrap-tarball
;; A tarball with the statically-linked Binutils programs.
(tarball-package %binutils-static-stripped))
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 94f57e0..d4b 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -44,7 +44,7 @@
#:use-module (guix utils)
#:use-module (guix gexp))
-(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up?
+(define %fake-bootstrap? #t) ; cheat using Guile instead of Mes for speed-up?
(define-public stage0-boot
(let ((version "0.0.8")
128/163: gnu: gcc-mesboot: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 2077dc0ec39b73e68f4c9f9ddf1b6f8f59eb71d3
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 21:40:03 2018 +0200
gnu: gcc-mesboot: Revise dependencies.
* gnu/packages/mes.scm (gcc-mesboot): Revise dependencies.
---
gnu/packages/mes.scm | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 17c8fa3..b0831d2 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -1088,7 +1088,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
(native-inputs `(("binutils-boot" ,binutils-mesboot)
("gcc-boot" ,gcc-mesboot0)
("glibc-boot" ,glibc-mesboot)
- ("kernel-headers" ,(linux-libre-headers-boot0
+
+ ("bootstrap-coreutils" ,%bootstrap-coreutils)
+ ("diffutils-boot0" ,(@@ (gnu packages commencement)
diffutils-boot0))
+ ("kernel-headers" ,(linux-libre-headers-boot0))
+ ("make-boot0" ,(@@ (gnu packages commencement)
gnu-make-boot0
(inputs `(("gmp-source" ,(package-source gmp-boot))
("mpfr-source" ,(package-source mpfr-boot))
("mpc-source" ,(package-source mpc
@@ -1184,21 +1188,13 @@ ac_cv_c_float_format='IEEE (little-endian)'
":" (assoc-ref %build-inputs "gcc-boot") "/bin"
;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ":" (assoc-ref %build-inputs "file") "/bin"
- ":" (assoc-ref %build-inputs "findutils") "/bin"
- ":" (assoc-ref %build-inputs "gawk") "/bin"
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ":" (assoc-ref %build-inputs "sed") "/bin"
- ":" (assoc-ref %build-inputs "tar") "/bin"))
+ ":" (assoc-ref %build-inputs "bootstrap-coreutils")
"/bin"
+ ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin"
+ ":" (assoc-ref %build-inputs "make-boot0") "/bin"))
(format (current-error-port) "PATH=~a\n" (getenv "PATH"))
(setenv "CONFIG_SHELL" (string-append
-(assoc-ref %build-inputs "bash")
+(assoc-ref %build-inputs
"bootstrap-coreutils")
"/bin/sh"))
(setenv "C_INCLUDE_PATH" (string-append
gcc
"/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"
126/163: gnu: gcc-mesboot0: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 9644890d0004b52fddd63e4ead1b9e1dcf53bac0
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 21:24:34 2018 +0200
gnu: gcc-mesboot0: Revise dependencies.
* gnu/packages/mes.scm (gcc-mesboot0): Revise dependencies.
---
gnu/packages/mes.scm | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index af96101..4a73ec9 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -899,9 +899,14 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
(supported-systems '("i686-linux"))
+ (inputs '())
(native-inputs `(("binutils" ,binutils-mesboot0)
("gcc" ,gcc-core-mesboot)
("glibc" ,glibc-mesboot)
+
+ ("bootstrap-coreutils" ,%bootstrap-coreutils)
+ ("diffutils-boot0" ,(@@ (gnu packages commencement)
diffutils-boot0))
+ ("make-boot0" ,(@@ (gnu packages commencement)
gnu-make-boot0))
("kernel-headers" ,(linux-libre-headers-boot0
(outputs '("out"))
(arguments
@@ -935,18 +940,13 @@ ac_cv_c_float_format='IEEE (little-endian)'
":" (assoc-ref %build-inputs "gcc") "/bin"
;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ":" (assoc-ref %build-inputs "sed") "/bin"
- ":" (assoc-ref %build-inputs "tar") "/bin"))
+ ":" (assoc-ref %build-inputs "bootstrap-coreutils")
"/bin"
+ ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin"
+ ":" (assoc-ref %build-inputs "make-boot0") "/bin"))
(format (current-error-port) "PATH=~a\n" (getenv "PATH"))
(setenv "CONFIG_SHELL" (string-append
-(assoc-ref %build-inputs "bash")
+(assoc-ref %build-inputs
"bootstrap-coreutils")
"/bin/sh"))
(setenv "C_INCLUDE_PATH" (string-append
;;gcc "/include" this is MES
@@ -963,7 +963,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(setenv "LD" "gcc")
(setenv "CPP" "gcc -E")
(setenv "RANLIB" "true")
-;;(setenv "LIBS" "-lgcc2 -ltcc1")
+
(with-output-to-file "config.cache"
(lambda _
(display "
114/163: gnu: gcc-core-mesboot: Package with bootstrap-guile.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 9249903715c85fd73689de3cf0c93985dd36ad91
Author: Jan Nieuwenhuizen
Date: Fri Jun 29 21:17:20 2018 +0200
gnu: gcc-core-mesboot: Package with bootstrap-guile.
* gnu/packages/mes.scm (gcc-core-mesboot): Package with bootstrap-guile.
---
gnu/packages/mes.scm | 223 ++-
1 file changed, 112 insertions(+), 111 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index afad180..ed5e548 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -714,124 +714,125 @@ standard.")
(string-append "--prefix=" out)
(define-public gcc-core-mesboot
- (package
-(inherit gcc)
-(name "gcc-core-mesboot")
-(version "2.95.3")
-(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
- version
- ".tar.gz"))
- (patches (search-patches "gcc-core-boot-2.95.3.patch"))
- (sha256
- (base32
-"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
-(supported-systems '("i686-linux"))
-(native-inputs `(("binutils" ,binutils-mesboot0)
- ("tcc" ,tcc-boot)))
-(outputs '("out"))
-(arguments
- `(#:tests? #f
- #:parallel-build? #f
- #:strip-binaries? #f
- #:make-flags (list
- "CC=tcc -static -D __GLIBC_MINOR__=6"
- "OLDCC=tcc -static -D __GLIBC_MINOR__=6"
- "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6"
- "AR=ar"
- "RANLIB=ranlib"
- (string-append "LIBGCC2_INCLUDES=-I "
-(assoc-ref %build-inputs "tcc")
-"/include")
- "LANGUAGES=c"
- (string-append "BOOT_LDFLAGS="
-" -B" (assoc-ref %build-inputs "tcc")
-"/lib/"))
- #:modules ((guix build gnu-build-system)
- (guix build utils)
- (srfi srfi-1))
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (tcc (assoc-ref %build-inputs "tcc"))
- (cppflags (string-append
- " -D __STDC__=1"
- " -D __GLIBC_MINOR__=6")))
- (setenv "PATH"
- (string-append
-(assoc-ref %build-inputs "binutils") "/bin"
-":" (assoc-ref %build-inputs "tcc") "/bin"
+ (package-with-bootstrap-guile
+ (package
+ (inherit gcc)
+ (name "gcc-core-mesboot")
+ (version "2.95.3")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
+ version
+ ".tar.gz"))
+ (patches (search-patches "gcc-core-boot-2.95.3.patch"))
+ (sha256
+(base32
+ "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
+ (supported-systems '("i686-linux"))
+ (native-inputs `(("binutils" ,binutils-mesboot0)
+ ("tcc" ,tcc-boot)))
+ (outputs '("out"))
+ (arguments
+ `(#:tests? #f
+#:parallel-build? #f
+#:strip-binaries? #f
+#:make-flags (list
+ "CC=tcc -static -D __GLIBC_MINOR__=6"
+ "OLDCC=tcc -static -D __GLIBC_MINOR__=6"
+ "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6"
+ "AR=ar"
+ "RANLIB=ranlib"
+ (string-append "LIBGCC2_INCLUDES=-I "
+ (assoc-ref %build-inputs "tcc")
+ "/include")
+ "LANGUAGES=c"
+ (string-append "BOOT_LDFLAGS="
+ " -B" (assoc-ref %build-inputs "tcc")
+ "/lib/&
121/163: gnu: tcc-boot0: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 56a6a44391cab5204b3853550ea5f5e589264c19
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 08:54:00 2018 +0200
gnu: tcc-boot0: Revise dependencies.
* gnu/packages/mes.scm (tcc-boot0): Revise dependencies.
---
gnu/packages/mes.scm | 18 ++
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 59f4e5a..21a3ca9 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -381,9 +381,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
-`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
- ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+`(("coreutils" , %bootstrap-coreutils)
("mes" ,mes-boot)
("mes-seed" ,%mes-seed)
("mescc-tools" ,mescc-tools-boot)
@@ -398,13 +396,11 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
#:builder
(begin
(use-modules (guix build utils))
-(let* ((bash (assoc-ref %build-inputs "static-bash"))
+(let* ((coreutils (assoc-ref %build-inputs "coreutils"))
(mes (assoc-ref %build-inputs "mes"))
(guile (assoc-ref %build-inputs "guile"))
(srfi-43 (assoc-ref %build-inputs "srfi-43"))
(mescc-tools (assoc-ref %build-inputs "mescc-tools"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
(source (assoc-ref %build-inputs "source"))
(nyacc-source (assoc-ref %build-inputs "nyacc-source"))
(mes-seed (assoc-ref %build-inputs "mes-seed"))
@@ -417,13 +413,11 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(dir (getcwd)))
;; unpack
(setenv "PATH" (string-append
- bash "/bin:"
- mes "/bin:"
- (if guile (string-append guile "/bin:")
+ coreutils "/bin"
+ ":" mes "/bin"
+ (if guile (string-append ":" guile "/bin")
"")
- mescc-tools "/bin:"
- tar "/bin:"
- xz "/bin"))
+ ":" mescc-tools "/bin"))
(format (current-error-port) "PATH=~s\n" (getenv "PATH"))
(mkdir-p "source")
(system* "tar" "--strip=1" "-C" "source" "-xvf" source)
91/163: gnu: gcc-core-boot: Install libgcc2.a too.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit bbc9a35e905b98bf56b226a27b70917aab0ace86
Author: Jan Nieuwenhuizen
Date: Sun Jun 17 20:51:19 2018 +0200
gnu: gcc-core-boot: Install libgcc2.a too.
* gnu/packages/mes.scm (gcc-core-boot): Install libgcc2.a too.
---
gnu/packages/mes.scm| 93 +++
gnu/packages/patches/gcc-core-boot-2.95.3.patch | 202
2 files changed, 265 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index ff9ec3d..cf7edc7 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -601,7 +601,7 @@ standard.")
(uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
version
".tar.gz"))
- (patches (search-patches "gcc-boot-2.95.3.patch"))
+ (patches (search-patches "gcc-core-boot-2.95.3.patch"))
(sha256
(base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
@@ -610,16 +610,22 @@ standard.")
("tcc" ,tcc-boot)))
(outputs '("out"))
(arguments
- `(#:tests? #f ; runtest: command not found
+ `(#:tests? #f
#:parallel-build? #f
#:strip-binaries? #f
- #:make-flags (list "CC=tcc -static"
- "OLDCC=tcc -static"
- "RANLIB=true"
- (string-append "LIBGCC2_INCLUDES=-I "
- (assoc-ref %build-inputs "tcc")
- "/include")
- "LANGUAGES=c")
+ #:make-flags (list
+ "CC=tcc -static -D __GLIBC_MINOR__=6"
+ "OLDCC=tcc -static -D __GLIBC_MINOR__=6"
+ "CC_FOR_BUILD=tcc -static -D __GLIBC_MINOR__=6"
+ "AR=ar"
+ "RANLIB=ranlib"
+ (string-append "LIBGCC2_INCLUDES=-I "
+(assoc-ref %build-inputs "tcc")
+"/include")
+ "LANGUAGES=c"
+ (string-append "BOOT_LDFLAGS="
+" -B" (assoc-ref %build-inputs "tcc")
+"/lib/"))
#:modules ((guix build gnu-build-system)
(guix build utils)
(srfi srfi-1))
@@ -628,21 +634,46 @@ standard.")
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
+ (tcc (assoc-ref %build-inputs "tcc"))
(cppflags (string-append
- "-D __STDC__=1"
+ " -D __STDC__=1"
" -D __GLIBC_MINOR__=6")))
- (when #t ;; no info
- (delete-file-recursively "texinfo")
- (system "touch gcc/cpp.info gcc/gcc.info"))
+ (setenv "PATH"
+ (string-append
+(assoc-ref %build-inputs "binutils") "/bin"
+":" (assoc-ref %build-inputs "tcc") "/bin"
+
+;; more bootstrap cheats
+":" (assoc-ref %build-inputs "bash") "/bin"
+":" (assoc-ref %build-inputs "coreutils") "/bin"
+":" (assoc-ref %build-inputs "diffutils") "/bin"
+":" (assoc-ref %build-inputs "file") "/bin"
+":" (assoc-ref %build-inputs "grep") "/bin"
+":" (assoc-ref %build-inputs "gzip") "/bin"
+":" (assoc-ref %build-inputs "make") "/bin"
+":" (assoc-ref %build-inputs "sed") "/bin"
+":" (assoc-ref %build-inputs "tar") "/bin"))
+
+ ;; no info at this stage
+ (delete-file-recursively "texinfo")
+ (system "touch gcc/cpp.info gcc/gcc.info")
+
(setenv "CONFIG_SHELL" (string-append
(assoc-ref %build-input
127/163: gnu: binutils-mesboot: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 7f7d774620cfd78607f46f1045d040eb9562c97e
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 21:33:14 2018 +0200
gnu: binutils-mesboot: Revise dependencies.
* gnu/packages/mes.scm (binutils-mesboot): Revise dependencies.
---
gnu/packages/mes.scm | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 4a73ec9..17c8fa3 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -996,7 +996,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
(native-inputs `(("binutils-mesboot" ,binutils-mesboot0)
("glibc-mesboot" ,glibc-mesboot)
("gcc-mesboot" ,gcc-mesboot0)
- ("kernel-headers" ,(linux-libre-headers-boot0
+
+ ("bootstrap-coreutils" ,%bootstrap-coreutils)
+ ("diffutils-boot0" ,(@@ (gnu packages commencement)
diffutils-boot0))
+ ("kernel-headers" ,(linux-libre-headers-boot0))
+ ("make-boot0" ,(@@ (gnu packages commencement)
gnu-make-boot0
(arguments
`(#:parallel-build? #f
#:configure-flags '("--enable-deterministic-archives"
@@ -1037,16 +1041,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
":" (assoc-ref %build-inputs "gcc-mesboot") "/bin"
;; more bootstrap cheats
- ":" (assoc-ref %build-inputs "bash") "/bin"
- ":" (assoc-ref %build-inputs "coreutils") "/bin"
- ":" (assoc-ref %build-inputs "diffutils") "/bin"
- ":" (assoc-ref %build-inputs "file") "/bin"
- ":" (assoc-ref %build-inputs "gawk") "/bin"
- ":" (assoc-ref %build-inputs "grep") "/bin"
- ":" (assoc-ref %build-inputs "gzip") "/bin"
- ":" (assoc-ref %build-inputs "make") "/bin"
- ":" (assoc-ref %build-inputs "sed") "/bin"
- ":" (assoc-ref %build-inputs "tar") "/bin"))
+ ":" (assoc-ref %build-inputs "bootstrap-coreutils")
"/bin"
+ ":" (assoc-ref %build-inputs "diffutils-boot0") "/bin"
+ ":" (assoc-ref %build-inputs "make-boot0") "/bin"))
(format (current-error-port) "PATH=~a\n" (getenv "PATH"))
(format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv
"C_INCLUDE_PATH"))
(format (current-error-port) "LIBRARY_PATH=~a\n" (getenv
"LIBRARY_PATH")))
116/163: gnu: gcc-mesboot0: Package with bootstrap-guile.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 034b6a931ecf80a623065d0c1d286d452e53f9c4
Author: Jan Nieuwenhuizen
Date: Fri Jun 29 21:18:51 2018 +0200
gnu: gcc-mesboot0: Package with bootstrap-guile.
* gnu/packages/mes.scm (gcc-mesboot0): Package with bootstrap-guile.
---
gnu/packages/mes.scm | 199 ++-
1 file changed, 100 insertions(+), 99 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0860ec5..eca2098 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -919,107 +919,108 @@ ac_cv_c_float_format='IEEE (little-endian)'
(apply system* "./configure" configure-flags))
(define-public gcc-mesboot0
- (package
-(inherit gcc-core-mesboot)
-(name "gcc-mesboot0")
-(version "2.95.3")
-(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
- version
- ".tar.gz"))
- (patches (search-patches "gcc-boot-2.95.3.patch"))
- (sha256
- (base32
-"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
-(supported-systems '("i686-linux"))
-(native-inputs `(("binutils" ,binutils-mesboot0)
- ("gcc" ,gcc-core-mesboot)
- ("glibc" ,glibc-mesboot)
- ("kernel-headers" ,(linux-libre-headers-boot0
-(outputs '("out"))
-(arguments
- `(#:tests? #f ; runtest: command not found
- #:parallel-build? #f
- #:strip-binaries? #f
- #:make-flags (list "RANLIB=true"
- (string-append "LIBGCC2_INCLUDES=-I "
- (assoc-ref %build-inputs "gcc")
- "/include")
- "LANGUAGES=c")
- #:modules ((guix build gnu-build-system)
- (guix build utils)
- (srfi srfi-1))
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
-(binutils (assoc-ref %build-inputs "binutils"))
-(gcc (assoc-ref %build-inputs "gcc"))
-(glibc (assoc-ref %build-inputs "glibc"))
-(headers (assoc-ref %build-inputs "kernel-headers")))
- (when #t ;; no info
- (delete-file-recursively "texinfo")
- (system "touch gcc/cpp.info gcc/gcc.info"))
-
- (setenv "PATH"
- (string-append
-(assoc-ref %build-inputs "binutils") "/bin"
-":" (assoc-ref %build-inputs "gcc") "/bin"
-
-;; more bootstrap cheats
-":" (assoc-ref %build-inputs "bash") "/bin"
-":" (assoc-ref %build-inputs "coreutils") "/bin"
-":" (assoc-ref %build-inputs "diffutils") "/bin"
-":" (assoc-ref %build-inputs "grep") "/bin"
-":" (assoc-ref %build-inputs "gzip") "/bin"
-":" (assoc-ref %build-inputs "make") "/bin"
-":" (assoc-ref %build-inputs "sed") "/bin"
-":" (assoc-ref %build-inputs "tar") "/bin"))
-
- (format (current-error-port) "PATH=~a\n" (getenv "PATH"))
- (setenv "CONFIG_SHELL" (string-append
- (assoc-ref %build-inputs "bash")
- "/bin/sh"))
- (setenv "C_INCLUDE_PATH" (string-append
- ;;gcc "/include" this is MES
- ;;":/"
- gcc
"/lib/gcc-lib/i386-unknown-linux/2.95.3/include"
- ":" headers "/include"
- ":" glibc "/include"))
- (setenv "LIBRARY_PATH" (string-append glibc "/lib"
-
101/163: gnu: binutils-mesboot0: Rename from binutils-boot0.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f2b20baf2b812cbfa26554f385a1eea5cda6747c
Author: Jan Nieuwenhuizen
Date: Sat Jun 23 19:00:18 2018 +0200
gnu: binutils-mesboot0: Rename from binutils-boot0.
* gnu/packages/mes.scm (binutils-mesboot0): Rename from binutils-boot0.
---
gnu/packages/mes.scm | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index b51d188..4a66998 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -633,10 +633,10 @@ standard.")
(system* "./configure"
(string-append "--prefix=" out)))
-(define-public binutils-boot0
+(define-public binutils-mesboot0
(package
(inherit binutils)
-(name "binutils-boot0")
+(name "binutils-mesboot0")
(version "2.20.1a")
(source (origin
(method url-fetch)
@@ -761,7 +761,7 @@ standard.")
(base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
(supported-systems '("i686-linux"))
-(native-inputs `(("binutils" ,binutils-boot0)
+(native-inputs `(("binutils" ,binutils-mesboot0)
("tcc" ,tcc-boot)))
(outputs '("out"))
(arguments
@@ -881,8 +881,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"
(supported-systems '("i686-linux"))
-(native-inputs `(("binutils" ,binutils-boot0)
("gcc" ,gcc-core-boot)
+(native-inputs `(("binutils" ,binutils-mesboot0)
("kernel-headers" ,(linux-libre-headers-boot0
(outputs '("out"))
(arguments
@@ -966,9 +966,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
(supported-systems '("i686-linux"))
-(native-inputs `(("binutils" ,binutils-boot0)
("gcc" ,gcc-core-boot)
("glibc" ,glibc-boot)
+(native-inputs `(("binutils" ,binutils-mesboot0)
("kernel-headers" ,(linux-libre-headers-boot0
(outputs '("out"))
(arguments
86/163: gnu: mes-boot: Update for fopen: Return 0 upon failure.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 47f6e5ece1ad9ecb495946224b562d8f527b5df5
Author: Jan Nieuwenhuizen
Date: Sat Jun 16 11:33:48 2018 +0200
gnu: mes-boot: Update for fopen: Return 0 upon failure.
* gnu/packages/mes.scm (mes-boot): Update for fopen: Return 0 upon failure.
---
gnu/packages/mes.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 327fecb..1bfc1da 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -230,8 +230,8 @@ hex2 linker.")
(define-public mes-boot
(let ((version "0.15")
-(revision "1")
-(commit "f0db60dce8dc368b4836771c8c32988bee0121ce"))
+(revision "2")
+(commit "ddcb6e186672d67f1739210240f38d195c47cc16"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -244,7 +244,7 @@ hex2 linker.")
"/mes-" commit ".tar.gz"))
(sha256
(base32
- "0vpg8c129x5d30ckcfjy5rjhkbdgrdfgxjbq8r55qy9qh19hzw4m"
+ "00i8b8s9b5lqlcaf195h0lpag3wmjisr1bcnp434cnhkicdl01q9"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
154/163: Revert "gnu: Add %bootstrap-diffutils."
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit adfff13ae903234ddcb7eccc4e9cebd5b652d83a
Author: Jan Nieuwenhuizen
Date: Tue Aug 28 01:13:55 2018 +0200
Revert "gnu: Add %bootstrap-diffutils."
This reverts commit a16596a950757de2bc6e3660fc2a2f8126998115.
---
gnu/packages/bootstrap.scm | 18 --
1 file changed, 18 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 631faee..9fd3e49 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -44,7 +44,6 @@
%bootstrap-guile
%bootstrap-coreutils
-%bootstrap-diffutils
%bootstrap-linux-libre-headers
%bootstrap-make
%bootstrap-binutils
@@ -443,23 +442,6 @@ $out/bin/guile --version~%"
(("^exec grep") (string-append (getcwd)
"/bin/grep"
(chmod "bin" #o555
-(define-public %bootstrap-diffutils
- (package-from-tarball
- "diffutils-bootstrap"
- (lambda (system)
- (origin
- (method url-fetch)
- (uri (match system
- ((or "i686-linux"
- "x86_64-linux")
-
"http://lilypond.org/janneke/mes/diffutils-static-stripped-3.6-i686-linux.tar.xz;)
- (_ (error "diffutils-bootstrap: system not supported"
- (sha256
-(base32
- "1qvackm4i42nba0wixpby17igcm64l98pbz05qsdrsy988s86ifh"
- "diff" ; the program to test
- "Bootstrap binaries of the GNU Diffutils"))
-
(define-public %bootstrap-make
(package-from-tarball
"make-bootstrap"
120/163: gnu: mes-boot: Update to 0.16.1; revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 0cc8fd30af5f56bd058802ee8d7374920ec8d67a
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 08:43:19 2018 +0200
gnu: mes-boot: Update to 0.16.1; revise dependencies.
* gnu/packages/mes.scm (mes-boot): Update to 0.16.1; revise dependencies.
---
gnu/packages/mes.scm | 27 ++-
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 403d02f..59f4e5a 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -223,9 +223,9 @@ hex2 linker.")
(license gpl3+)
(define-public mes-boot
- (let ((version "0.16")
+ (let ((version "0.16.1")
(revision "0")
-(commit "f9a4e219727bedd504ea49885c3260c38755c1d0"))
+(commit "6a48f4a81431d4357057ff928a7df880e3f3e6b4"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -238,14 +238,11 @@ hex2 linker.")
"/mes-" commit ".tar.gz"))
(sha256
(base32
- "1rvk2drps0g0klljw190ljpfd28bfpw9iw2n6s3lrw6ch7x8jgpn"
+ "1d1sfp54j8wsvv10mlsr4bh3n7fb70hhb164kldsrrixw6sk0nvi"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
-`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
- ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
- ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+`(("coreutils" , %bootstrap-coreutils)
("mescc-tools" ,mescc-tools-boot)
("nyacc-source" ,(package-source nyacc-boot))
("mes-seed" ,%mes-seed)
@@ -258,12 +255,10 @@ hex2 linker.")
#:builder
(begin
(use-modules (guix build utils))
-(let* ((bash (assoc-ref %build-inputs "static-bash"))
+(let* ((coreutils (assoc-ref %build-inputs "coreutils"))
(guile (assoc-ref %build-inputs "guile"))
(srfi-43 (assoc-ref %build-inputs "srfi-43"))
(mescc-tools (assoc-ref %build-inputs "mescc-tools"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
(source (assoc-ref %build-inputs "source"))
(nyacc-source (assoc-ref %build-inputs "nyacc-source"))
(mes-seed (assoc-ref %build-inputs "mes-seed"))
@@ -272,11 +267,9 @@ hex2 linker.")
;; unpack
(setenv "PATH" (string-append
- bash "/bin:"
- (if guile (string-append guile "/bin:") "")
- mescc-tools "/bin:"
- tar "/bin:"
- xz "/bin"))
+ coreutils "/bin"
+ (if guile (string-append ":" guile "/bin") "")
+ ":" mescc-tools "/bin"))
(format (current-error-port) "PATH=~s\n" (getenv "PATH"))
(mkdir-p "source")
(system* "tar" "--strip=1" "-C" "source" "-xvf" source)
@@ -290,7 +283,7 @@ hex2 linker.")
(chdir "source")
;; configure
- (setenv "PREFIX" out)
+ (setenv "prefix" out)
;; (setenv "BUILD_DEBUG" "1")
(if ,%fake-bootstrap?
@@ -332,7 +325,7 @@ hex2 linker.")
(zero? (system* "sh" "check.sh")))
;; install
- (setenv "SHELL" (string-append bash "/bin/bash"))
+ (setenv "SHELL" (string-append coreutils "/bin/bash"))
(zero? (system* "sh" "install.sh")))
(description
"Mes [Maxwell Equations of Software] aims to create full source
118/163: gnu: mescc-tools-boot: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f9e167c4ec5d548db66df7aabd6b932d9a91c824
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 08:06:33 2018 +0200
gnu: mescc-tools-boot: Revise dependencies.
* gnu/packages/mes.scm (mescc-tools-boot): Revise dependencies.
---
gnu/packages/mes.scm | 15 ---
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 09579fd..bbd9ca9 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -178,10 +178,7 @@ with a Knight VM that runs Forth and Lisp.")
(base32
"14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf"
(native-inputs
-`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
- ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
- ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+`(("coreutils" , %bootstrap-coreutils)
("mescc-tools-seed" ,%mescc-tools-seed)
("mes-source" ,(package-source mes-boot))
("mes-seed" ,%mes-seed)))
@@ -192,19 +189,15 @@ with a Knight VM that runs Forth and Lisp.")
#:builder
(begin
(use-modules (guix build utils))
-(let* ((bash (assoc-ref %build-inputs "static-bash"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
+(let* ((coreutils (assoc-ref %build-inputs "coreutils"))
(source (assoc-ref %build-inputs "source"))
(mescc-tools-seed (assoc-ref %build-inputs
"mescc-tools-seed"))
(mes-seed (assoc-ref %build-inputs "mes-seed"))
(mes-source (assoc-ref %build-inputs "mes-source"))
(out (assoc-ref %outputs "out"))
(out/bin (string-append out "/bin")))
- (setenv "PATH" (string-append bash "/bin:"
-"../mescc-tools-seed:"
-tar "/bin:"
-xz "/bin"))
+ (setenv "PATH" (string-append coreutils "/bin"
+":" "../mescc-tools-seed"))
(format (current-error-port) "PATH=~s\n" (getenv "PATH"))
(mkdir-p "source")
(system* "tar" "--strip=1" "-C" "source" "-xvf" source)
92/163: gnu: Add binutils-boot 2.20.1, built with gcc+glibc.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit e4f7217ea271be98331eb48e265b54899177e4fa
Author: Jan Nieuwenhuizen
Date: Sun Jun 17 20:52:37 2018 +0200
gnu: Add binutils-boot 2.20.1, built with gcc+glibc.
* gnu/packages/mes.scm (binutils-boot0): Rename from binutils-boot.
(binutils-boot): New package.
---
gnu/packages/mes.scm | 49 -
1 file changed, 40 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index cf7edc7..c003989 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -542,10 +542,10 @@ standard.")
(system* "./configure"
(string-append "--prefix=" out)))
-(define-public binutils-boot
+(define-public binutils-boot0
(package
(inherit binutils)
-(name "binutils-boot")
+(name "binutils-boot0")
(version "2.14")
(source (origin
(method url-fetch)
@@ -555,7 +555,7 @@ standard.")
(base32
"1w8xp7k44bkijr974x9918i4p1sw4g2fcd5mxvspkjpg38m214ds"
(supported-systems '("i686-linux"))
-(native-inputs `(("flex" ,flex) ; MORTAL SIN HERE
+(native-inputs `(("flex" ,flex) ; MORTAL SIN HERE
("mes" ,mes-boot)
("tcc" ,tcc-boot)))
(arguments
@@ -585,11 +585,42 @@ standard.")
(and
(zero?
(system* "./configure"
-"--disable-shared"
-"--enable-static"
-"--host=i386-unknown-linux"
-"--target=i386-unknown-linux"
-(string-append "--prefix=" out
+ "--disable-shared"
+ "--enable-static"
+ "--host=i386-unknown-linux"
+ "--target=i386-unknown-linux"
+ (string-append "--prefix=" out
+
+(define-public binutils-boot
+ (package
+(inherit binutils-boot0)
+(name "binutils-boot")
+(native-inputs `(("flex" ,flex) ; cheat
+ ("glibc" ,glibc-boot)
+ ("gcc" ,gcc-boot)))
+(arguments
+ `(#:tests? #f ; runtest: command not found
+ #:parallel-build? #f
+ #:strip-binaries? #f
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(glibc (assoc-ref %build-inputs "glibc")))
+ (setenv "C_INCLUDE_PATH" (string-append glibc "/include"))
+ (unsetenv "LIBRARY_PATH" (string-append glibc "/lib"))
+ (setenv "CONFIG_SHELL" (string-append
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh"))
+ (and (zero?
+ (system* "./configure"
+ "--disable-nls"
+ "--disable-shared"
+ "--disable-werror"
+ "--host=i386-unknown-linux"
+ "--target=i386-unknown-linux"
+ (string-append "--prefix=" out
(define-public gcc-core-boot
(package
@@ -606,7 +637,7 @@ standard.")
(base32
"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
(supported-systems '("i686-linux"))
-(native-inputs `(("binutils" ,binutils-boot)
+(native-inputs `(("binutils" ,binutils-boot0)
("tcc" ,tcc-boot)))
(outputs '("out"))
(arguments
109/163: REMOVEME: %fake-bootstrap => #t.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 101db8d7b45ac6c5d152dac5238d66f3ead1d065 Author: Jan Nieuwenhuizen Date: Sat Jun 2 11:14:22 2018 +0200 REMOVEME: %fake-bootstrap => #t. --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 744b10d..fd5af35 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -44,7 +44,7 @@ #:use-module (guix utils) #:use-module (guix gexp)) -(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up? +(define %fake-bootstrap? #t) ; cheat using Guile instead of Mes for speed-up? (define %mescc-tools-seed (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb"))
111/163: gnu: m4-mesboot: Package with boostrap-guile.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit a92d237c7a872614e4f63f3e138b6ac8dd94df78
Author: Jan Nieuwenhuizen
Date: Fri Jun 29 21:22:28 2018 +0200
gnu: m4-mesboot: Package with boostrap-guile.
* gnu/packages/mes.scm (m4-mesboot): Package with boostrap-guile.
---
gnu/packages/mes.scm | 57 ++--
1 file changed, 29 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 744b10d..e1c0c8e 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -605,34 +605,35 @@ standard.")
(copy-file "libtcc1.a" (string-append out
"/lib/tcc/libtcc1.a")
(define-public m4-mesboot
- (package
-(inherit m4)
-(name "m4-mesboot")
-(version "1.4")
-(source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/m4/m4-"
- version ".tar.gz"))
- (sha256
- (base32
-"1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw"
-(supported-systems '("i686-linux"))
-(native-inputs `(("mes" ,mes-boot)
- ("tcc" ,tcc-boot)))
-(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (setenv "CONFIG_SHELL" (string-append
- (assoc-ref %build-inputs "bash")
- "/bin/sh"))
- (setenv "CC" "tcc -static")
- (setenv "CPP" "tcc -E")
- (zero?
-(system* "./configure"
- (string-append "--prefix=" out)))
+ (package-with-bootstrap-guile
+ (package
+ (inherit m4)
+ (name "m4-mesboot")
+ (version "1.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/m4/m4-"
+ version ".tar.gz"))
+ (sha256
+(base32
+ "1f9bxj176kf3pvs350w2dfs8jgwhminywri5pyn01b11yc4yhsjw"
+ (supported-systems '("i686-linux"))
+ (native-inputs `(("mes" ,mes-boot)
+ ("tcc" ,tcc-boot)))
+ (arguments
+ `(#:phases
+(modify-phases %standard-phases
+ (replace 'configure
+(lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+(setenv "CONFIG_SHELL" (string-append
+(assoc-ref %build-inputs "bash")
+"/bin/sh"))
+(setenv "CC" "tcc -static")
+(setenv "CPP" "tcc -E")
+(zero?
+ (system* "./configure"
+ (string-append "--prefix=" out
(define-public binutils-mesboot0
(package
108/163: gnu: Add gcc-mesboot 4.7.4. WIP
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 2daa20578f2a41172eaa4c9670f1409c576e4330
Author: Jan Nieuwenhuizen
Date: Sun Jun 24 20:30:08 2018 +0200
gnu: Add gcc-mesboot 4.7.4. WIP
* gnu/packages/mes.scm (gcc-mesboot-4.1.0): Rename from gcc-mesboot.
(gcc-mesboot): New package.
* gnu/packages/patches/gcc-boot-4.7.4.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/packages/mes.scm | 40 +++-
gnu/packages/patches/gcc-boot-4.7.4.patch | 43 +++
2 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index e6a35d3..744b10d 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -1100,7 +1100,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(sha256 (base32
"0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94"))
-(define-public gcc-mesboot
+(define-public gcc-mesboot-4.1.0
(package-with-bootstrap-guile
(package
(inherit gcc-mesboot0)
@@ -1240,6 +1240,44 @@ ac_cv_c_float_format='IEEE (little-endian)'
(zero?
(apply system* "./configure" configure-flags)))
+(define-public gcc-mesboot
+ (package-with-bootstrap-guile
+ (package
+ (inherit gcc-mesboot-4.1.0)
+ (name "gcc-mesboot")
+ (version "4.7.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gcc/gcc-4.7.4/gcc-"
+ version
+ ".tar.gz"))
+ (patches (search-patches "gcc-boot-4.7.4.patch"))
+ (sha256
+(base32
+ "06bqygv17f71f7g7pi7ddvhljcr8dimrypgiif9g1r6lqn1sbfnx"
+ (native-inputs `(("binutils-boot" ,binutils-mesboot)
+ ("gcc-boot" ,gcc-mesboot-4.1.0)
+ ("glibc-boot" ,glibc-mesboot)
+ ("kernel-headers" ,(linux-libre-headers-boot0
+ ;; (inputs `(("gmp-source" ,(package-source gmp))
+ ;; ("mpfr-source" ,(package-source mpfr-boot))
+ ;; ("mpc-source" ,(package-source mpc
+ (arguments
+ `(
+;;#:make-flags (list "LIBGCC2_CFLAGS=-D IN_LIBGCC2" )
+,@(substitute-keyword-arguments (package-arguments gcc-mesboot-4.1.0)
+((#:configure-flags configure-flags)
+ `(let ((flags (filter (lambda (flag)
+ (not (string-prefix?
"--enable-languages=" flag)))
+ ,configure-flags)))
+(cons*
+; with gmp-2.4.3 Configuring in
+ ; host-i386-unknown-linux/gmp configure: error: invalid
+ ; feature name: libstdc++-v3
+ ;; "--disable-libstdc++-v3"
+ ;;"--enable-languages=c,c++"
+ "--enable-languages=c"
+ flags)
;;;
(define-public nyacc
diff --git a/gnu/packages/patches/gcc-boot-4.7.4.patch
b/gnu/packages/patches/gcc-boot-4.7.4.patch
new file mode 100644
index 000..76c8c4d
--- /dev/null
+++ b/gnu/packages/patches/gcc-boot-4.7.4.patch
@@ -0,0 +1,43 @@
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index f3cc49fdb18..bc5718fc9a6 100644
+--- a/gcc/Makefile.in
b/gcc/Makefile.in
+@@ -458,7 +458,7 @@ LINKER_PLUGIN_API_H = $(srcdir)/../include/plugin-api.h
+ LTO_SYMTAB_H = $(srcdir)/../include/lto-symtab.h
+
+ # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
+-NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@
++# NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@
+ # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
+ CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
+
+diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c
+index 94b7a0b89a7..ab2baab55ca 100644
+--- a/gcc/config/host-linux.c
b/gcc/config/host-linux.c
+@@ -23,6 +23,12 @@
+ #include "hosthooks.h"
+ #include "hosthooks-def.h"
+
++// ../.././gcc/config/host-linux.c:213: `SSIZE_MAX' undeclared (first
++// use in this function)
++#include
++#ifndef SSIZE_MAX
++# define SSIZE_MAXLONG_MAX
++#endif
+
+ /* Linux has a feature called exec-shield-randomize that perturbs the
+address of non-fixed mapped segments by a (relatively) small amount.
+diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
+index c301ff03cae..f86318c3bd5 100644
+--- a/libgcc/Makefile.in
b/libgcc/Makefile.in
+@@ -225,7 +225,7 @@ endif
+ LIBGCC2_DEBUG_CFLAGS = -g
+ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS)
\
+$(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
+- -fbuilding-libgcc -fno-stack-protector \
++ -fno-stack-protector \
+$(INHIBIT_LIBC_CFLAGS)
+
+ # Additional options to use when compiling libgcc2.a.
117/163: gnu: Remove gcc-mesboot-4.1.0.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 1ad68c873781964cacc90847006b1c0541e48de2 Author: Jan Nieuwenhuizen Date: Wed Jul 11 18:23:58 2018 +0200 gnu: Remove gcc-mesboot-4.1.0. * gnu/packages/mes.scm (gcc-mesboot-4.1.0): Remove. (gcc-mesboot): Inherit from gcc-mesboot0. (binutils-mesboot0, gcc-core-mesboot, glibc-mesboot, gcc-mesboot0, binutils-mesboot, gcc-mesboot): Use --build=i686-unknown-linux-gnu, --host=i686-unknown-linux-gnu. * gnu/packages/patches/gcc-boot-4.7.4.patch: Update. --- gnu/local.mk | 1 - gnu/packages/mes.scm | 177 +- gnu/packages/patches/gcc-boot-4.1.0.patch | 30 - gnu/packages/patches/gcc-boot-4.7.4.patch | 13 +++ 4 files changed, 89 insertions(+), 132 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 8dc23fe..76e6bbc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -698,7 +698,6 @@ dist_patch_DATA = \ %D%/packages/patches/gcc-arm-link-spec-fix.patch \ %D%/packages/patches/gcc-asan-missing-include.patch \ %D%/packages/patches/gcc-boot-2.95.3.patch \ - %D%/packages/patches/gcc-boot-4.1.0.patch\ %D%/packages/patches/gcc-cross-environment-variables.patch \ %D%/packages/patches/gcc-fix-texi2pod.patch \ %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \ diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index eca2098..09579fd 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -709,8 +709,9 @@ standard.") "--disable-nls" "--disable-shared" "--disable-werror" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" + "--with-sysroot=/" (string-append "--prefix=" out) (define-public gcc-core-mesboot @@ -807,8 +808,8 @@ ac_cv_c_float_format='IEEE (little-endian)' (system* "./configure" "--disable-shared" "--enable-static" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" (string-append "--prefix=" out))) (add-after 'install 'install2 (lambda* (#:key outputs #:allow-other-keys) @@ -816,7 +817,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (tcc-lib (string-append tcc "/lib/x86-mes-gcc")) (out (assoc-ref outputs "out")) (gcc-dir (string-append - out "/lib/gcc-lib/i386-unknown-linux/2.95.3"))) + out "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3"))) (and (mkdir-p "tmp") (zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) @@ -866,8 +867,8 @@ ac_cv_c_float_format='IEEE (little-endian)' "--disable-shared" "--enable-static" "--disable-sanity-checks" - "--host=i386-unknown-linux" - "--target=i386-unknown-linux" + "--build=i686-unknown-linux-gnu" + "--host=i686-unknown-linux-gnu" (string-append "--with-headers=" headers "/include") "--enable-static-nss" "--without-__thread" @@ -986,7 +987,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (setenv "C_INCLUDE_PATH" (string-append ;;gcc "/include" this is MES ;;":/" - gcc "/lib/gcc-lib/i386-unknown-linux/2.95.3/include" + gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" ":" headers "/include" ":" glibc "/include")) (setenv "LIBRARY_PATH" (string-append glibc "/lib" @@ -1008,14 +1009,14 @@ ac_cv_c_float_format='IEEE (little-e
55/163: gnu: %mescc-tools-seed: Update for 0.15.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit edcadea38bcc0326cd4712b9d59a0affbed0ab39 Author: Jan Nieuwenhuizen Date: Fri Jun 1 13:38:31 2018 +0200 gnu: %mescc-tools-seed: Update for 0.15. * gnu/packages/mes.scm (%mescc-tools-seed): Update for 0.15. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 487aac1..650469a 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -40,7 +40,7 @@ #:use-module (guix packages)) (define %mescc-tools-seed - (let ((commit"0ab06b6d53afdb9e410b5c0e02001d00fff5f23f")) + (let ((commit"32881b9ff21fb41dc846914753b6cdadd75927c4")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed; @@ -48,7 +48,7 @@ "/mescc-tools-seed-" commit ".tar.gz")) (sha256 (base32 -"0vc81jg9wh0f0zxd3lhc4yk6bil9gy06bmpl8fy07c9mmdny98p3") +"0p5lk4wnb56jxmxxfdx31wgakhhid9xqsimf19c4pnvwlzpm4wan") (define %mes-seed (let ((commit "86e555fe9e58529b8ee2dd819f233c6e2dba063b"))
74/163: gnu: gcc-boot: Update to 3.4.0.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f3496751771e97b13bb5d9bb3bd088aeab9f1874
Author: Jan Nieuwenhuizen
Date: Sun Jun 10 11:08:27 2018 +0200
gnu: gcc-boot: Update to 3.4.0.
* gnu/packages/mes.scm (gcc-boot): Update to 3.4.0.
* gnu/packages/patches (gcc-boot-3.4.0.patch): New file.
* gnu/packages/patches (gcc-boot-3.2.patch): Remove.
* gnu/local.mk (dist_patch_DATA): Rename it.
---
gnu/local.mk | 2 +-
gnu/packages/mes.scm | 8 +++---
gnu/packages/patches/gcc-boot-3.2.patch | 34
gnu/packages/patches/gcc-boot-3.4.0.patch | 44 +++
4 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ed50249..8f025cf 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -696,7 +696,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-asan-missing-include.patch \
- %D%/packages/patches/gcc-boot-3.2.patch \
+ %D%/packages/patches/gcc-boot-3.4.0.patch\
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index fde5431..7e3d7fc 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -595,16 +595,16 @@ standard.")
(package
(inherit gcc)
(name "gcc-boot")
-(version "3.2")
+(version "3.4.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnu/gcc/gcc-3.2/gcc-core-"
+ (uri (string-append "mirror://gnu/gcc/gcc-3.4.0/gcc-core-"
version
".tar.gz"))
- (patches (search-patches "gcc-boot-3.2.patch"))
+ (patches (search-patches "gcc-boot-3.4.0.patch"))
(sha256
(base32
-"1pyik02gmi425d110m8j0gavp3lkqlg5rlh71hng12rha35dplsj"
+"08c1y1yajmxia64pw7anr3hh7d368c1ncfj6prl38aq2z6srxr88"
(supported-systems '("i686-linux"))
(native-inputs `(("binutils" ,binutils-boot)
("tcc" ,tcc-boot)))
diff --git a/gnu/packages/patches/gcc-boot-3.2.patch
b/gnu/packages/patches/gcc-boot-3.2.patch
deleted file mode 100644
index 2533c8b..000
--- a/gnu/packages/patches/gcc-boot-3.2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -purN -x config.status -x config.h -x BOOT
../gcc-3.2/gcc/config/i386/i386.c gcc-3.2/gcc/config/i386/i386.c
../gcc-3.2/gcc/config/i386/i386.c 2002-08-07 20:10:57.0 +0200
-+++ gcc-3.2/gcc/config/i386/i386.c 2018-06-06 15:39:23.235166230 +0200
-@@ -721,7 +721,9 @@ static int ix86_fp_comparison_cost PARAM
- static int ix86_save_reg PARAMS ((int, int));
- static void ix86_compute_frame_layout PARAMS ((struct ix86_frame *));
- static int ix86_comp_type_attributes PARAMS ((tree, tree));
-+#if 0
- const struct attribute_spec ix86_attribute_table[];
-+#endif
- static tree ix86_handle_cdecl_attribute PARAMS ((tree *, tree, tree, int,
bool *));
- static tree ix86_handle_regparm_attribute PARAMS ((tree *, tree, tree, int,
bool *));
-
-@@ -820,7 +822,7 @@ static enum x86_64_reg_class merge_class
- #undef TARGET_SCHED_REORDER
- #define TARGET_SCHED_REORDER ix86_sched_reorder
-
--struct gcc_target targetm = TARGET_INITIALIZER;
-+struct gcc_target targetm = {0};
-
- /* Sometimes certain combinations of command options do not make
-sense on a particular target machine. You can define a macro
-diff -purN -x config.status -x config.h -x BOOT ../gcc-3.2/gcc/configure
gcc-3.2/gcc/configure
../gcc-3.2/gcc/configure 2002-06-29 02:20:11.0 +0200
-+++ gcc-3.2/gcc/configure 2018-06-06 15:14:04.134194009 +0200
-@@ -3005,7 +3005,7 @@ if { (eval echo configure:2991: \"$ac_co
- elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
- ac_cv_c_float_format='IEEE (little-endian)'
- elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
--ac_cv_c_float_format='IEEE (little-endian)'
-+ac_cv_c_float_format=o'IEEE (little-endian)'
- elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
- ac_cv_c_float_format='VAX D-float'
- elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
diff --git a/gnu/packages/patches/gcc-boot-3.4.0.patch
b/gnu/packages/patches/gcc-boot-3.4.0.patch
new file mode 100644
index 000..bfbea3b
--- /dev/null
+++ b/gnu/p
47/163: gnu: %tinycc-seed: Update for mes 0.13.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit fc0067ddb1170a56bd1d42b030c086758e12d651 Author: Jan Nieuwenhuizen Date: Fri Apr 27 20:36:45 2018 +0200 gnu: %tinycc-seed: Update for mes 0.13. * gnu/packages/mes.scm (%tinycc-seed): Update for mes 0.13. Use new gitlab url scheme. --- gnu/packages/mes.scm | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 0c02e29..2015830 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -62,15 +62,15 @@ "0yjw2pp87dgmgk6qz04r0f72jfs67c356a4isc9v7v9zzgni6ihw") (define %tinycc-seed - (origin -(method url-fetch) -(uri (string-append "https://gitlab.com/janneke/tinycc-seed; -"/repository/archive.tar.gz?ref=" -"f23975bc49704d56539b3707d8afc17eaa955356")) -(file-name (string-append "tinycc-seed" "-" "0.9.26" ".tar.xz")) -(sha256 - (base32 - "0b7jpzwrf4adn1wwffll5hi775f7a2d8jimcm48agkj1sd9j6r20" + (let ((commit "c6c2dd26cc0743fb4877996ce340bf99a3e3714e")) +(origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc-seed; + "/-/archive/" commit + "/tinycc-seed-" commit ".tar.gz")) + (sha256 + (base32 +"1igny96r4wqwq6scp6ayd4bzmsvch7p32n6g580373gryznnzm6z") (define %srfi-43 (origin
59/163: gnu: %tinycc-seed: Update for mes 0.15.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit c70be1d213052d1af67385d670cf379ef0f926eb Author: Jan Nieuwenhuizen Date: Mon May 28 19:11:20 2018 +0200 gnu: %tinycc-seed: Update for mes 0.15. * gnu/packages/mes.scm (%tinycc-seed): Update for mes 0.15. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 2988b7f..c122ddf 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -64,7 +64,7 @@ "10rzfcjawcc97r0hc7b5m42z5bhaljbmwrnm7xsrliy6s881vz8s") (define %tinycc-seed - (let ((commit "b677978374f13d9fa39f08ae9e6b71d328c562ae")) + (let ((commit "a39d918b3fd9d8b07d981d69e3af88733efa54c1")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed; @@ -72,7 +72,7 @@ "/tinycc-seed-" commit ".tar.gz")) (sha256 (base32 -"00qia0ggsk4cnv4205cz76z4n0mklvqynnjcz3xzlggsmlja9mpq") +"0hh04vvq3jxcrkyjwnkyvapsd5xw7vpgb3igbycp8nynsikf145g") (define %srfi-43 (origin
52/163: gnu: tcc-boot: Update for mes 0.14.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 5fa99d268dad191bff0733b952ad0443ead96f98
Author: Jan Nieuwenhuizen
Date: Thu May 3 12:00:38 2018 +0200
gnu: tcc-boot: Update for mes 0.14.
* gnu/packages/mes.scm (tcc-boot): Update for mes 0.14.
---
gnu/packages/mes.scm | 49 ++---
1 file changed, 38 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 393e2e2..375b561 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -359,7 +359,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(define-public tcc-boot
(let ((version "0.9.26")
(revision "0")
-(commit "ddea739c89e145004526b5f66f3b47b20ae30cf2"))
+(commit "ff1caa80178b8c7d91c14c52b030ff067faef46f"))
(package-with-bootstrap-guile
(package
(name "tcc-boot")
@@ -372,16 +372,16 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
"/tinycc-" commit ".tar.gz"))
(sha256
(base32
- "0w17a2qjh6rcfmd8phw6zxdgwh6yfwdxy6i9awzi8fckfjcwkywh"
+ "066z8z1wlzs0k8a1xv6ds0g25vvxwd24fzdca59bahwdaaq0j0ic"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("libc" ,@(assoc-ref %bootstrap-inputs "libc"))
;; For testing with Guile
;; ("guile" ,%bootstrap-guile)
+ ;; ("libc" ,@(assoc-ref %bootstrap-inputs "libc"))
;; guile-2.0.9 does not have srfi-43; cherry-pick
- ("srfi-43" ,%srfi-43)
+ ;; ("srfi-43" ,%srfi-43)
("tar" ,(search-bootstrap-binary "tar" (%current-system)))
("xz" ,(search-bootstrap-binary "xz" (%current-system)))
("mes" ,mes-boot)
@@ -407,7 +407,9 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))
(out (assoc-ref %outputs "out"))
(libc (assoc-ref %build-inputs "libc"))
- (interpreter (string-append libc ,(glibc-dynamic-linker)))
+ (interpreter (if libc
+(string-append libc
,(glibc-dynamic-linker))
+(string-append mes "/lib/mes-loader")))
(dir (getcwd)))
(setenv "PATH" (string-append
bash "/bin:"
@@ -426,9 +428,12 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
(mkdir-p "tinycc-seed")
(system* "tar" "--strip=1" "-C" "tinycc-seed" "-xvf" tinycc-seed)
- (mkdir-p "srfi")
- (system* "cp" srfi-43 "srfi/srfi-43.scm")
+ (when srfi-43
+(mkdir-p "srfi")
+(system* "cp" srfi-43 "srfi/srfi-43.scm"))
(chdir "source")
+
+ ;; configure
(setenv "PREFIX" out)
(setenv "MESCC" (string-append mes "/bin/mescc"))
(symlink (string-append mes "/share/mes") "mes")
@@ -457,7 +462,6 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(symlink (string-append "../nyacc-source/module")
"nyacc")))
(and
- ;; configure
(zero? (system* "sh" "configure"
"--prefix=$PREFIX"
(string-append "--elfinterp=" interpreter)
@@ -467,9 +471,32 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
;; build
(zero? (system* "sh" "build.sh"))
- (zero? (system* "sh" "-ex" "test.sh" "01-return-0"))
- ;; check: 1/68 tests fail
- (or (zero? (system* "sh" "check.sh")) #t)
+ ;; check
+ (setenv "MES" "mes")
+
14/163: bump tcc-boot: mlibc: GNU Gcc support: setjmp, longjmp.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 1e0ee6ee7eab4bfc828e98841daee158f82daa86
Author: Jan Nieuwenhuizen
Date: Sun Nov 26 13:31:21 2017 +0100
bump tcc-boot: mlibc: GNU Gcc support: setjmp, longjmp.
---
gnu/packages/mes.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index dd81b86..5bb3c34 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -331,7 +331,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(define-public tcc-boot
(let ((version "0.9.26")
(revision "0")
-(commit "37e6553c1e97c9fcb5f12f6d3fe546489d2d5596"))
+(commit "8f495f27423acbf569459f517466a07ed2c96c45"))
(package
(name "tcc-boot")
(version (string-append version "-" revision "." (string-take commit 7)))
@@ -345,7 +345,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
- "0zvr48a410yjz7pb6lq6rajp1x864pyrvna75ik0213qyfgw0pfr"
+ "15kh9qpc12pph0yz1rz8v646kx9x62a1cqgy0g0y4vbj3sampdsy"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -374,11 +374,11 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(method url-fetch)
(uri (string-append "https://gitlab.com/janneke/tinycc-seed;
"/repository/archive.tar.gz?ref="
- "900edb4fb2077282a486bd0739fff4574ffbaaf9"))
+ "393a3117a91ec057494986bd75215e1a1786d69d"))
(file-name (string-append name "-seed" "-" version ".tar.xz"))
(sha256
(base32
- "157g9mjcci5q4m5rgrpvxqqa2adrgaz6ykmd8snkmh88cxnjpasv"))
+ "0ipb59my9hxkaybvj8bss5chqs2ypga3k765l93z374p57cqmllm"))
(arguments
`(#:modules ((guix build utils))
#:builder
60/163: gnu: tinycc-boot: Update for mes 0.15.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 4b63468c5b58d03ba850e3e08d5c194129a8bbea
Author: Jan Nieuwenhuizen
Date: Mon May 28 19:13:22 2018 +0200
gnu: tinycc-boot: Update for mes 0.15.
* gnu/packages/mes.scm (tinycc-boot): If %fake-bootstrap?, cheat using Guile
to build in ~5min. Update for mes 0.15.
---
gnu/packages/mes.scm | 61 +---
1 file changed, 24 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index c122ddf..d4e7320 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -373,7 +373,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(define-public tcc-boot
(let ((version "0.9.26")
(revision "0")
-(commit "ff1caa80178b8c7d91c14c52b030ff067faef46f"))
+(commit "97196cebf6c5c79ec87f1ee4875cc8c188333a3c"))
(package-with-bootstrap-guile
(package
(name "tcc-boot")
@@ -386,23 +386,22 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
"/tinycc-" commit ".tar.gz"))
(sha256
(base32
- "066z8z1wlzs0k8a1xv6ds0g25vvxwd24fzdca59bahwdaaq0j0ic"
+ "1z156jfnc0dkdb6i9h0nns4hm11c03k3vakw7qhb7651dm8hqxrk"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ;; For testing with Guile
- ;; ("guile" ,%bootstrap-guile)
- ;; ("libc" ,@(assoc-ref %bootstrap-inputs "libc"))
- ;; guile-2.0.9 does not have srfi-43; cherry-pick
- ;; ("srfi-43" ,%srfi-43)
("tar" ,(search-bootstrap-binary "tar" (%current-system)))
("xz" ,(search-bootstrap-binary "xz" (%current-system)))
("mes" ,mes-boot)
("mes-seed" ,%mes-seed)
("mescc-tools" ,mescc-tools-boot)
("nyacc-source" ,(package-source nyacc-boot))
- ("tinycc-seed" ,%tinycc-seed)))
+ ("tinycc-seed" ,%tinycc-seed)
+ ,@(if %fake-bootstrap? ; cheat: fast non-bootstrap testing with Guile
+`(("guile" ,%bootstrap-guile)
+ ("srfi-43" ,%srfi-43)) ; guile-2.0.9 lacks srfi-43;
cherry-pick
+'(
(arguments
`(#:modules ((guix build utils))
#:builder
@@ -425,6 +424,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(string-append libc
,(glibc-dynamic-linker))
(string-append mes "/lib/mes-loader")))
(dir (getcwd)))
+ ;; unpack
(setenv "PATH" (string-append
bash "/bin:"
mes "/bin:"
@@ -456,10 +456,11 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(setenv "ONE_SOURCE" "1")
(setenv "PREPROCESS" "1")
(setenv "MES_DEBUG" "1")
+ (setenv "MES_ARENA" "7000")
+ (setenv "MES_MAX_ARENA" "7000")
- (if guile
- ;; For testing with Guile+mescc -- Guile+Nyacc+MesCC, ~30
times faster
- (begin
+ (if ,%fake-bootstrap?
+ (begin ; Cheat using Guile+Nyacc+MesCC; ~30 times faster
(setenv "MES" "guile")
(setenv "GUILE_AUTO_COMPILE" "1")
(setenv "GUILE_LOAD_COMPILED_PATH"
@@ -468,10 +469,14 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(string-append dir
":" guile "/share/guile/2.0/"
":" dir "/nyacc-source/module"
- ":" mes "/share/mes/guile")))
+ ":" mes "/share/mes/guile"))
+
+;; give auto-compile a home -- massive speed-up
+(mkdir-p "/tmp/home")
+(setenv "HOME" "/tmp/home"))
- ;; For true bootstrap:
89/163: gnu: %tinycc-seed: Update for mes 0.16.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit fcc6db82db82570c9a8208e7b4e8cd58c7e2281e Author: Jan Nieuwenhuizen Date: Sun Jun 17 09:00:01 2018 +0200 gnu: %tinycc-seed: Update for mes 0.16. * gnu/packages/mes.scm (%tinycc-seed): Update for mes 0.16. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 1337982..bf40cab 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -68,7 +68,7 @@ "0s4h72wza9gxgihfbcnz6f8j4ds9vik2703n9dziv6ck95j1xlnd") (define %tinycc-seed - (let ((commit "a39d918b3fd9d8b07d981d69e3af88733efa54c1")) + (let ((commit "347f5eff39161bd2f82277e541887af322379d65")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed; @@ -76,7 +76,7 @@ "/tinycc-seed-" commit ".tar.gz")) (sha256 (base32 -"0hh04vvq3jxcrkyjwnkyvapsd5xw7vpgb3igbycp8nynsikf145g") +"01gqdgiyjyn8l4h9nfi56a07fjgibjn7825ixqzxrd618bp3fqmh") (define %srfi-43 (origin
25/163: gnu: Update mescc-tools-boot: Binaries with function debug info.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit fd3e6216edfdcd8d2974f9d5899854dbb7f1e880
Author: Jan Nieuwenhuizen
Date: Sun Dec 3 08:15:32 2017 +0100
gnu: Update mescc-tools-boot: Binaries with function debug info.
* gnu/packages/mes.scm (mescc-tools-boot): Update: Binaries with function
debug info.
(%mescc-tools-seed): Likewise.
---
gnu/packages/mes.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 5b91530..4fa35cd 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -44,11 +44,11 @@
(method url-fetch)
(uri (string-append "https://gitlab.com/janneke/mescc-tools-seed;
"/repository/archive.tar.gz?ref="
-"a4aa5dd0a2f1b452c864dbe5aadd70875a58e225"))
+"09f390010785c975e18bba6ef00b16ac4ba28327"))
(file-name (string-append "mescc-tools-seed" "-" "0.3" ".tar.xz"))
(sha256
(base32
- "1wb2g4w5238ndkihyjxg7wbk1cfrkg4hy662lhr4jqglnq0d8bb2"
+ "0g63cqxn8c65dhqar96xjqmzfzkszwsayb2acjl445592zz7wv3f"
(define %mes-seed
(origin
@@ -157,7 +157,7 @@ with a Knight VM that runs Forth and Lisp.")
(define-public mescc-tools-boot
(let ((version "0.3")
(revision "0")
-(commit "587a4b4c5d2fcda836272b613c802e8ca9c55523"))
+(commit "bd860fc132fc047f0c3554a50171d2477ae7b8e7"))
(package-with-bootstrap-guile
(package
(name "mescc-tools-boot")
@@ -171,7 +171,7 @@ with a Knight VM that runs Forth and Lisp.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
- "0kh4a9hvhhxgxqx2j5gz6s20mdwp5a121pncyi2g8ixn12wbp92v"
+ "1jc1n383s35pqkjcyhaa4xqgxynfc7lj40zzik7vc537xrxgll05"
(native-inputs
`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
("bash" ,(search-bootstrap-binary "bash" (%current-system)))
40/163: gnu: tinycc-boot: Update for mes-0.12.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f61b58f8072bdddf78a850d8d23ea9b63a3f4390
Author: Jan Nieuwenhuizen
Date: Sun Apr 8 18:10:34 2018 +0200
gnu: tinycc-boot: Update for mes-0.12.
* gnu/packages/mes.scm (tinycc-boot): Update for mes-0.12. Build using
Mes+MesCC only, do not use Guile.
---
gnu/packages/mes.scm | 33 -
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 7e5b914..6724da4 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -358,11 +358,12 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
- "1q6la34dch8bihw470zpdxdp5j08k2mijfiz77qm28aig79y0l1h"
+ "0s4fzr3ax61a196152knkajq2jj50fpx9pg8li14121j6zjrmmwh"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
`(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
+ ("libc" ,@(assoc-ref %bootstrap-inputs "libc"))
("guile" ,%bootstrap-guile)
;; guile-2.0.9 does not have srfi-43; cherry-pick
("srfi-43" ,%srfi-43)
@@ -390,6 +391,9 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(mes-seed (assoc-ref %build-inputs "mes-seed"))
(tinycc-seed (assoc-ref %build-inputs "tinycc-seed"))
(out (assoc-ref %outputs "out"))
+ ;;(libc ,(with-store store (package-output store
%bootstrap-glibc)))
+ (libc (assoc-ref %build-inputs "libc"))
+ (interpreter (string-append libc ,(glibc-dynamic-linker)))
(dir (getcwd)))
(setenv "PATH" (string-append bash "/bin:"
mes "/bin:"
@@ -411,20 +415,31 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(chdir "source")
(setenv "PREFIX" out)
(setenv "MESCC" (string-append mes "/bin/mescc.scm"))
+ (setenv "MES_PREFIX" (string-append mes "/share/mes"))
(setenv "OBJDUMP" "true")
- (setenv "GUILE_AUTO_COMPILE" "1")
- (setenv "GUILE_LOAD_COMPILED_PATH"
- (string-append guile "/lib/guile/2.0/ccache"))
+ (setenv "interpreter" interpreter)
+
+ ;; for mescc.scm -- Guile+Nyacc+MesCC, ~30 times faster
+ ;; (setenv "GUILE_AUTO_COMPILE" "1")
+ ;; (setenv "GUILE_LOAD_COMPILED_PATH"
+ ;; (string-append guile "/lib/guile/2.0/ccache"))
+ ;; (setenv "GUILE_LOAD_PATH"
+ ;; (string-append dir
+ ;;":" guile "/share/guile/2.0/"
+ ;;":" dir "/nyacc-source/module"
+ ;;":" mes "/share/mes/guile"))
+
+ ;; for mescc.mes -- Mes+Nyacc+MesCC
+ (setenv "MES_ARENA" "8000")
+ (setenv "MESCC" (string-append mes "/bin/mescc.mes"))
(setenv "GUILE_LOAD_PATH"
- (string-append dir
- ":" guile "/share/guile/2.0/"
- ":" dir "/nyacc-source/module"
- ":" mes "/share/mes/guile"))
+ (string-append "../nyacc-source/module"))
+
(and
;; configure
(zero? (system* "sh" "configure"
"--prefix=$PREFIX"
- "--elfinterp=interpreter"
+ (string-append "--elfinterp=" interpreter)
"--crtprefix=."
"--tccdir=."))
17/163: bump: mlibc: Mescc-tools support: chmod.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8dc0ac36cdce0aa701e97716abdd8c41b4990547
Author: Jan Nieuwenhuizen
Date: Sun Nov 26 19:08:51 2017 +0100
bump: mlibc: Mescc-tools support: chmod.
---
gnu/packages/mes.scm | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index bcdc3cb..17cf5d0 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -67,7 +67,7 @@
(uri (string-append "https://gitlab.com/janneke/stage0-seed;
"/repository/archive.tar.gz?ref="
"87039121e9ab4d48e9bade513c6f328cc9968583"))
- (file-name (string-append name "-seed" "-" version ".tar.xz"))
+ (file-name (string-append "stage0-seed" "-" version ".tar.xz"))
(sha256
(base32
"0m18mv825nykj738gg9il60xb8xxc4015ypxgimhygdqxx0n66bp"))
@@ -141,7 +141,7 @@ with a Knight VM that runs Forth and Lisp.")
(uri (string-append "https://gitlab.com/janneke/mescc-tools-seed;
"/repository/archive.tar.gz?ref="
"b0f8fd0e31c41cb91aefd17047da1f5743370e4b"))
- (file-name (string-append name "-seed" "-" version ".tar.xz"))
+ (file-name (string-append "mescc-tools-seed" "-" version ".tar.xz"))
(sha256
(base32
"065nmxpp73hnynqil0f1d3cgldkfpx64zach1i31iz05f9xy3yzn"
@@ -215,7 +215,7 @@ hex2 linker.")
(define-public mes-boot
(let ((version "0.11")
(revision "0")
-(commit "d9d6bc3b9dacfd018a6b43d80f9278f3fba94747"))
+(commit "a3d445e9049f6b6603d8c69c0e33bd071cf15b1c"))
(package
(name "mes-boot")
(version (string-append version "-" revision "." (string-take commit 7)))
@@ -228,7 +228,7 @@ hex2 linker.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
-"1y0pfmhqdrz4gff9j8g9f6bwb351bqsjirw465pdjgq7sn27rj3v"
+"0ss7qrzavl3m33naq3v1qawzd8nniwa84cm7kqkkv5n5l6rawxjw"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -340,7 +340,6 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(source (origin
(method url-fetch)
(uri (string-append "https://gitlab.com/janneke/tinycc;
-
"/repository/archive.tar.gz?ref="
commit))
(file-name (string-append name "-" version ".tar.xz"))
11/163: tcc-boot: bump tinycc-seed: GNU Gcc support: Add ferror.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 948f4a88e27cfccb81b942487ed56680fe9e60ce Author: Jan Nieuwenhuizen Date: Sun Nov 26 13:05:42 2017 +0100 tcc-boot: bump tinycc-seed: GNU Gcc support: Add ferror. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 6264a10..202dd90 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -374,11 +374,11 @@ extensive examples, including parsers for the Javascript and C99 languages.") (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed; "/repository/archive.tar.gz?ref=" - "ba22f1f123af5ec11fbd1ef99508e961e5fdb521")) + "900edb4fb2077282a486bd0739fff4574ffbaaf9")) (file-name (string-append name "-seed" "-" version ".tar.xz")) (sha256 (base32 - "0l276qwda166lm27w0yv37wisdgxx2giv8b5lsbynyf3ax7045mf")) + "157g9mjcci5q4m5rgrpvxqqa2adrgaz6ykmd8snkmh88cxnjpasv")) (arguments `(#:modules ((guix build utils)) #:builder
13/163: bump mes-seed: mlibc: GNU Gcc support: setjmp, longjmp.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 1fa4d491654e2acabb8ca3f3a6a1bda9303541c7
Author: Jan Nieuwenhuizen
Date: Sun Nov 26 14:46:12 2017 +0100
bump mes-seed: mlibc: GNU Gcc support: setjmp, longjmp.
---
gnu/packages/mes.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 5abeac2..dd81b86 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -151,11 +151,11 @@ with a Knight VM that runs Forth and Lisp.")
(method url-fetch)
(uri (string-append "https://gitlab.com/janneke/mes-seed;
"/repository/archive.tar.gz?ref="
- "7ed68e26db72884dc287852e021858c28ce1c557"))
+ "fe64ff3a855d20bc90a5f28237e9832d33731b91"))
(file-name (string-append "mes-seed-0.11" ".tar.xz"))
(sha256
(base32
- "1pknfxdynn8gv1xnwfwqbpgqmi0j80yvj2n20y2lq3rhmmyhz81b"))
+ "0ggc7r5mla44ilaxxj4x1z0k757i9h5ymd54l7wvjw7883z3ag5j"))
(supported-systems '("i686-linux" "x86_64-linux"))
(build-system trivial-build-system)
(arguments
@@ -243,11 +243,11 @@ hex2 linker.")
(method url-fetch)
(uri (string-append "https://gitlab.com/janneke/mes-seed;
"/repository/archive.tar.gz?ref="
- "7ed68e26db72884dc287852e021858c28ce1c557"))
+ "fe64ff3a855d20bc90a5f28237e9832d33731b91"))
(file-name (string-append "mes-seed-0.11" ".tar.xz"))
(sha256
(base32
- "1pknfxdynn8gv1xnwfwqbpgqmi0j80yvj2n20y2lq3rhmmyhz81b"))
+ "0ggc7r5mla44ilaxxj4x1z0k757i9h5ymd54l7wvjw7883z3ag5j"))
(arguments
`(#:modules ((guix build utils))
#:builder
75/163: Revert "gnu: gcc-boot: Update to 3.4.0."
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 3c269295e37c4f843347589b241ade4824181cb6
Author: Jan Nieuwenhuizen
Date: Sun Jun 10 20:07:55 2018 +0200
Revert "gnu: gcc-boot: Update to 3.4.0."
This reverts commit b8dc92280df74233bd85fc459311ff139355f0c4.
---
gnu/local.mk | 2 +-
gnu/packages/mes.scm | 8 +++---
gnu/packages/patches/gcc-boot-3.2.patch | 34
gnu/packages/patches/gcc-boot-3.4.0.patch | 44 ---
4 files changed, 39 insertions(+), 49 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 8f025cf..ed50249 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -696,7 +696,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-asan-missing-include.patch \
- %D%/packages/patches/gcc-boot-3.4.0.patch\
+ %D%/packages/patches/gcc-boot-3.2.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 7e3d7fc..fde5431 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -595,16 +595,16 @@ standard.")
(package
(inherit gcc)
(name "gcc-boot")
-(version "3.4.0")
+(version "3.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnu/gcc/gcc-3.4.0/gcc-core-"
+ (uri (string-append "mirror://gnu/gcc/gcc-3.2/gcc-core-"
version
".tar.gz"))
- (patches (search-patches "gcc-boot-3.4.0.patch"))
+ (patches (search-patches "gcc-boot-3.2.patch"))
(sha256
(base32
-"08c1y1yajmxia64pw7anr3hh7d368c1ncfj6prl38aq2z6srxr88"
+"1pyik02gmi425d110m8j0gavp3lkqlg5rlh71hng12rha35dplsj"
(supported-systems '("i686-linux"))
(native-inputs `(("binutils" ,binutils-boot)
("tcc" ,tcc-boot)))
diff --git a/gnu/packages/patches/gcc-boot-3.2.patch
b/gnu/packages/patches/gcc-boot-3.2.patch
new file mode 100644
index 000..2533c8b
--- /dev/null
+++ b/gnu/packages/patches/gcc-boot-3.2.patch
@@ -0,0 +1,34 @@
+diff -purN -x config.status -x config.h -x BOOT
../gcc-3.2/gcc/config/i386/i386.c gcc-3.2/gcc/config/i386/i386.c
+--- ../gcc-3.2/gcc/config/i386/i386.c 2002-08-07 20:10:57.0 +0200
gcc-3.2/gcc/config/i386/i386.c 2018-06-06 15:39:23.235166230 +0200
+@@ -721,7 +721,9 @@ static int ix86_fp_comparison_cost PARAM
+ static int ix86_save_reg PARAMS ((int, int));
+ static void ix86_compute_frame_layout PARAMS ((struct ix86_frame *));
+ static int ix86_comp_type_attributes PARAMS ((tree, tree));
++#if 0
+ const struct attribute_spec ix86_attribute_table[];
++#endif
+ static tree ix86_handle_cdecl_attribute PARAMS ((tree *, tree, tree, int,
bool *));
+ static tree ix86_handle_regparm_attribute PARAMS ((tree *, tree, tree, int,
bool *));
+
+@@ -820,7 +822,7 @@ static enum x86_64_reg_class merge_class
+ #undef TARGET_SCHED_REORDER
+ #define TARGET_SCHED_REORDER ix86_sched_reorder
+
+-struct gcc_target targetm = TARGET_INITIALIZER;
++struct gcc_target targetm = {0};
+
+ /* Sometimes certain combinations of command options do not make
+sense on a particular target machine. You can define a macro
+diff -purN -x config.status -x config.h -x BOOT ../gcc-3.2/gcc/configure
gcc-3.2/gcc/configure
+--- ../gcc-3.2/gcc/configure 2002-06-29 02:20:11.0 +0200
gcc-3.2/gcc/configure 2018-06-06 15:14:04.134194009 +0200
+@@ -3005,7 +3005,7 @@ if { (eval echo configure:2991: \"$ac_co
+ elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
+ ac_cv_c_float_format='IEEE (little-endian)'
+ elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
+-ac_cv_c_float_format='IEEE (little-endian)'
++ac_cv_c_float_format=o'IEEE (little-endian)'
+ elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
+ ac_cv_c_float_format='VAX D-float'
+ elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
diff --git a/gnu/packages/patches/gcc-boot-3.4.0.patch
b/gnu/packages/patches/gcc-boot-3.4.0.patch
deleted file mode 100644
index bfbea3b..000
--- a/gnu/packages/patches/gcc-boot-3.4.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -purN -x config.status -x config.h -x BOOT ../gcc-3.4.0/gcc/Makefile.i
82/163: Revert "REMOVEME: %fake-bootstrap => #t."
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 3dbc3664eb5277b95242f5b03f8d20fc6e0c85da Author: Jan Nieuwenhuizen Date: Tue Jun 12 10:40:47 2018 +0200 Revert "REMOVEME: %fake-bootstrap => #t." This reverts commit 81ab5fc222a7754db7580ee9f75042fb337d2d90. --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 1805c4a..99d66a8 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -43,7 +43,7 @@ #:use-module (guix utils) #:use-module (guix gexp)) -(define %fake-bootstrap? #t) ; cheat using Guile instead of Mes for speed-up? +(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up? (define %mescc-tools-seed (let ((commit"32881b9ff21fb41dc846914753b6cdadd75927c4"))
104/163: gnu: gcc-mesboot: Rename from gcc-boot.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit c9f900420f93027c0f400bb3d4ec82c7a040938b Author: Jan Nieuwenhuizen Date: Sat Jun 23 18:33:35 2018 +0200 gnu: gcc-mesboot: Rename from gcc-boot. * gnu/packages/mes.scm (gcc-mesboot): Rename from gcc-boot. --- gnu/packages/mes.scm | 35 +- gnu/packages/patches/gcc-boot-2.95.3.patch | 13 --- 2 files changed, 15 insertions(+), 33 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 08fba27..deb8085 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -949,19 +949,17 @@ ac_cv_c_float_format='IEEE (little-endian)' (zero? (apply system* "./configure" configure-flags) -(define-public gcc-boot +(define-public gcc-mesboot (package -(name "gcc-boot") (inherit gcc-core-mesboot) +(name "gcc-mesboot") (version "2.95.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-" version ".tar.gz")) - (patches (search-patches ;;"gcc-core-boot-2.95.3.patch" - "gcc-boot-2.95.3.patch" - )) + (patches (search-patches "gcc-boot-2.95.3.patch")) (sha256 (base32 "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an" @@ -998,28 +996,15 @@ ac_cv_c_float_format='IEEE (little-endian)' (setenv "PATH" (string-append -;;(assoc-ref %build-inputs "flex") "/bin" -;;":" - (assoc-ref %build-inputs "binutils") "/bin" ":" (assoc-ref %build-inputs "gcc") "/bin" -;; REMOVE NEW glibc/bin from path -;; we suddenly get this error: linux/errno.h -;; via a glibc-2.25 errno.h - +;; more bootstrap cheats ":" (assoc-ref %build-inputs "bash") "/bin" -;; ":" (assoc-ref %build-inputs "bzip2") "/bin" ":" (assoc-ref %build-inputs "coreutils") "/bin" -;; ":" (assoc-ref %build-inputs "diffutils") "/bin" -;; ":" (assoc-ref %build-inputs "file") "/bin" -;; ":" (assoc-ref %build-inputs "findutils") "/bin" -;; ":" (assoc-ref %build-inputs "gawk") "/bin" ":" (assoc-ref %build-inputs "grep") "/bin" ":" (assoc-ref %build-inputs "gzip") "/bin" -;; ":" (assoc-ref %build-inputs "m4") "/bin" ":" (assoc-ref %build-inputs "make") "/bin" -;; ":" (assoc-ref %build-inputs "patch") "/bin" ":" (assoc-ref %build-inputs "sed") "/bin" ":" (assoc-ref %build-inputs "tar") "/bin")) @@ -1054,7 +1039,17 @@ ac_cv_c_float_format='IEEE (little-endian)' "--disable-shared" "--host=i386-unknown-linux" "--target=i386-unknown-linux" - (string-append "--prefix=" out + (string-append "--prefix=" out))) + (add-after 'install 'install2 + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) +(gcc-dir (string-append + out "/lib/gcc-lib/i386-unknown-linux/2.95.3"))) + (and +(mkdir-p "tmp") +(zero? (system (string-append "set -x; cd tmp && ar x ../gcc/libgcc2.a"))) +(zero? (system (string-append "set -x; cd tmp && ar r " gcc-dir "/libgcc.a *.o"))) +(copy-file "gcc/libgcc2.a" (string-append out "/lib/libgcc2.a"))) ;;; diff --git a/gnu/packages/patches/gcc-boot-2.95.3.patch b/gnu/packages/patches/gcc-boot-2.9
119/163: gnu: %mes-seed: Update for mes 0.16.1.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit f54dd96c96694f59ca6094ed581ab14a3424db4d Author: Jan Nieuwenhuizen Date: Thu Jul 12 08:42:24 2018 +0200 gnu: %mes-seed: Update for mes 0.16.1. * gnu/packages/mes.scm (%mes-seed): Update for mes 0.16.1. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index bbd9ca9..403d02f 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -58,7 +58,7 @@ "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v") (define %mes-seed - (let ((commit "e9e4c291b20ec134bb2e756238a1feb85747dfc0")) + (let ((commit "c5fc21ee182784dc86f69593d7d1b231cad81edb")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes-seed; @@ -66,7 +66,7 @@ "/mes-seed-" commit ".tar.gz")) (sha256 (base32 -"0s4h72wza9gxgihfbcnz6f8j4ds9vik2703n9dziv6ck95j1xlnd") +"0is2ag9byj7y8w8xqna1lzp41r6pljvwj3nzknwd8i36jvvy6kl9") (define %tinycc-seed (let ((commit "347f5eff39161bd2f82277e541887af322379d65"))
72/163: gnu: gcc-boot: Update to 3.0.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 5f34ec7672857ed3a83bdd2e2e9be6726df4278c
Author: Jan Nieuwenhuizen
Date: Sun Jun 10 11:01:04 2018 +0200
gnu: gcc-boot: Update to 3.0.
* gnu/packages/mes.scm (gcc-boot): Update to 3.0.
* gnu/packages/patches (gcc-boot-3.0.patch): New file.
* gnu/packages/patches (gcc-boot-2.95.3.patch): Remove.
* gnu/local.mk (dist_patch_DATA): Rename it.
---
gnu/local.mk | 2 +-
gnu/packages/mes.scm | 40 +++
gnu/packages/patches/gcc-boot-2.95.3.patch | 172 -
gnu/packages/patches/gcc-boot-3.0.patch| 37 +++
4 files changed, 53 insertions(+), 198 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 548a7ea..18ed844 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -696,7 +696,7 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-asan-missing-include.patch \
- %D%/packages/patches/gcc-boot-2.95.3.patch \
+ %D%/packages/patches/gcc-boot-3.0.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index fe93a7e..6c95ad8 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -595,16 +595,16 @@ standard.")
(package
(inherit gcc)
(name "gcc-boot")
-(version "2.95.3")
+(version "3.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
+ (uri (string-append "mirror://gnu/gcc/gcc-3.0/gcc-core-"
version
".tar.gz"))
- (patches (search-patches "gcc-boot-2.95.3.patch"))
+ (patches (search-patches "gcc-boot-3.0.patch"))
(sha256
(base32
-"1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"
+"13x04j77h9jw7g74v41s7jvxb2n3nx0mdvg8cf3i2bm306mss5vk"
(supported-systems '("i686-linux"))
(native-inputs `(("binutils" ,binutils-boot)
("tcc" ,tcc-boot)))
@@ -656,27 +656,17 @@ ac_cv_c_float_format='IEEE (little-endian)'
"--host=i386-unknown-linux"
"--target=i386-unknown-linux"
(string-append "--prefix=" out)))
- (add-after 'install 'install2
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((tcc (assoc-ref %build-inputs "tcc"))
-(tcc-lib (string-append tcc "/lib/x86-mes-gcc"))
-(out (assoc-ref outputs "out"))
-(gcc-dir (string-append out
"/lib/gcc-lib/i386-unknown-linux/2.95.3")))
- (copy-file (string-append tcc-lib "/crt1.o")
- (string-append gcc-dir "/crt1.o"))
- (with-output-to-file "crti.c" (lambda _ (display "")))
- (system* "tcc" "-static" "-c" "crti.c")
- (copy-file "crti.o" (string-append gcc-dir "/crti.o"))
- (with-output-to-file "crtn.c" (lambda _ (display "")))
- (system* "tcc" "-static" "-c" "crtn.c")
- (copy-file "crtn.o" (string-append gcc-dir "/crtn.o"))
- (system* "ar" "r" (string-append gcc-dir "/libc.a")
-(string-append tcc "/lib/x86-mes-gcc/libc+gnu.o"))
- (system* "ar" "r" (string-append out "/lib/libc.a")
-(string-append tcc "/lib/x86-mes-gcc/libc+gnu.o"))
- (system* "ls" "-ltrF" gcc-dir)
- (copy-recursively (string-append tcc "/include")
- (string-append out "/include"))
+ (replace 'build
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (let ((tcc-boot (assoc-ref %build-inputs "tcc")))
+ ;; (system* "ar" "r" "libg.a"
+ ;; (string-append tcc-boot "/lib/x86-mes-gcc/libg.o"))
+ (and (zero? (apply system* (cons "ma
137/163: gnu: tcc-boot: Use gnu-build-system.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8c502888065865f5ef20134518271cd51a20f661
Author: Jan Nieuwenhuizen
Date: Thu Aug 23 21:05:26 2018 +0200
gnu: tcc-boot: Use gnu-build-system.
* gnu/packages/mes.scm (tcc-boot): Use gnu-build-system.
---
gnu/packages/mes.scm | 143 ---
1 file changed, 78 insertions(+), 65 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index c357d47..94f57e0 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -492,77 +492,90 @@ standard.")
(sha256
(base32
"177bdhwzrnqgyrdv1dwvpd04fcxj68s5pm1dzwny6359ziway8yy"
- (build-system trivial-build-system)
+ (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
-
(native-inputs
`(("coreutils" , %bootstrap-coreutils)
("mes" ,mes-boot)
("tcc" ,tcc-boot0)))
(arguments
- `(#:modules ((guix build utils))
-#:builder
-(begin
- (use-modules (guix build utils))
- (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
- (source (assoc-ref %build-inputs "source"))
- (mes (assoc-ref %build-inputs "mes"))
- (tcc (assoc-ref %build-inputs "tcc"))
- (out (assoc-ref %outputs "out"))
- (libc (assoc-ref %build-inputs "libc"))
- (interpreter (if libc
- (string-append libc ,(glibc-dynamic-linker))
- (string-append mes "/lib/mes-loader"
-;; unpack
-(setenv "PATH" (string-append
-coreutils "/bin"
-":" tcc "/bin"))
-(format (current-error-port) "PATH=~s\n" (getenv "PATH"))
-(mkdir-p "source")
-(system* "tar" "--strip=1" "-C" "source" "-xvf" source)
-(chdir "source")
-
-;; configure
-(and
- (zero? (system* "sh" "configure"
- (string-append "--cc=tcc")
- (string-append "--cpu=i386")
- (string-append "--prefix=" out)
- (string-append "--elfinterp=" interpreter)
- (string-append "--crtprefix=" tcc "/lib")
- (string-append "--sysincludepaths=" tcc
"/include")
- (string-append "--libpaths=" tcc "/lib")))
- ;; make
- (zero? (system* "tcc"
- "-vvv"
- "-D" "BOOTSTRAP=1"
- "-D" "ONE_SOURCE=1"
- "-D" "TCC_TARGET_I386=1"
- "-D" "CONFIG_TCC_STATIC=1"
- "-D" "CONFIG_USE_LIBGCC=1"
- "-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_ELFINTERP=\""
interpreter "\"")
- "-D" (string-append "CONFIG_TCC_LIBPATHS=\"" tcc
"/lib:{B}/lib:.\"")
- "-D" (string-append
"CONFIG_TCC_SYSINCLUDEPATHS=\"" tcc "/include" ":/include:{B}/include\"")
- "-D" (string-append "TCC_LIBGCC=\"" tcc
"/lib/libc.a\"")
- "-I" (string-append tcc "/out")
- "-L" (string-append tcc "/lib")
- "-o" "tcc"
- "tcc.c"))
- (mkdir-p (string-append out "/bin"))
- (copy-file "tcc" (string-append out "/bin/tcc"))
- (mkdir-p (string-append out "/lib/tcc"))
- (copy-recursively (string-append
122/163: gnu: tcc-boot: Revise dependencies.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f1128b94ea5fe1a43b797963c1ed808734cf2b28
Author: Jan Nieuwenhuizen
Date: Thu Jul 12 08:59:01 2018 +0200
gnu: tcc-boot: Revise dependencies.
* gnu/packages/mes.scm (tcc-boot): Revise dependencies.
---
gnu/packages/mes.scm | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 21a3ca9..a8a01b0 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -511,9 +511,7 @@ standard.")
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
- `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
-("tar" ,(search-bootstrap-binary "tar" (%current-system)))
-("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+ `(("coreutils" , %bootstrap-coreutils)
("mes" ,mes-boot)
("tcc" ,tcc-boot0)))
(arguments
@@ -521,9 +519,7 @@ standard.")
#:builder
(begin
(use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "static-bash"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
+ (let* ((coreutils (assoc-ref %build-inputs "coreutils"))
(source (assoc-ref %build-inputs "source"))
(mes (assoc-ref %build-inputs "mes"))
(tcc (assoc-ref %build-inputs "tcc"))
@@ -534,10 +530,8 @@ standard.")
(string-append mes "/lib/mes-loader"
;; unpack
(setenv "PATH" (string-append
-bash "/bin:"
-tar "/bin:"
-tcc "/bin:"
-xz "/bin"))
+coreutils "/bin"
+":" tcc "/bin"))
(format (current-error-port) "PATH=~s\n" (getenv "PATH"))
(mkdir-p "source")
(system* "tar" "--strip=1" "-C" "source" "-xvf" source)
147/163: gnu: %tinycc-seed: Update for mes 0.18. WIP
janneke pushed a commit to branch wip-bootstrap in repository guix. commit cb13e50301f6bbe680d87a36db855cb65d3dc108 Author: Jan Nieuwenhuizen Date: Mon Aug 27 01:12:51 2018 +0200 gnu: %tinycc-seed: Update for mes 0.18. WIP * gnu/packages/bootstrap.scm (%tinycc-seed): Update for mes 0.18. --- gnu/packages/bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index e6664c9..778f162 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -712,7 +712,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "15w3gqsmwn03s8wski9l319sxv07bkxc43cjdpzk13bkk90zpjdx") (define %tinycc-seed - (let ((commit "546500b97fb07147add1bc4aef2c10899f6a4306")) + (let ((commit "b89277fa58b3448fba7e178f53dd902c34a68750")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed; @@ -720,7 +720,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/tinycc-seed-" commit ".tar.gz")) (sha256 (base32 -"0803x488jbc2xv68pk633krfxnhyh6k56cmnyiva547m02r0z32h") +"0vlndgwvlyxl76zdnn545s38pxcnmsr671mb95yp3yhxivhlnrmk") (define %srfi-43 (origin
29/163: gnu: Update tcc-boot: mescc has no unsigned arithmetic.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 1c3a178e47b39f49b4ef12660c230c08db8c8d98
Author: Jan Nieuwenhuizen
Date: Sun Dec 3 21:54:57 2017 +0100
gnu: Update tcc-boot: mescc has no unsigned arithmetic.
* gnu/packages/mes.scm (tcc-boot): Update: bootstrappable: mescc has no
unsigned arithmetic.
---
gnu/packages/mes.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0689b4e..a1b4d65 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -340,7 +340,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(define-public tcc-boot
(let ((version "0.9.26")
(revision "0")
-(commit "c3257b03c466a9d3045a5eddc142dd97744a91e5"))
+(commit "407549050452a50447fd357d1841192995152da9"))
(package-with-bootstrap-guile
(package
(name "tcc-boot")
@@ -354,7 +354,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
- "0wiqrcliqv8vswhrh79irap7gd9b9sgp6i94nd2swq3kgdnnc44c"
+ "1aywfnncbd6wf09sgidv8j7d4y7xdcyjmhd93yfzb9rimzwi1kss"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -427,7 +427,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
;; build
(zero? (system* "sh" "build.sh"))
- ;; check: 17/65 tests fail
+ ;; check: 9/65 tests fail
(zero? (system* "sh" "-ex" "test.sh" "01-return-0"))
(or (zero? (system* "sh" "check.sh")) #t)
88/163: gnu: mes-boot: Update to 0.16.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 7042f2ea9d5e2065f900df72df2edc065f9cd68c
Author: Jan Nieuwenhuizen
Date: Sun Jun 17 09:06:30 2018 +0200
gnu: mes-boot: Update to 0.16.
* gnu/packages/mes.scm (mes-boot): Update to 0.16.
---
gnu/packages/mes.scm | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 365c953..1337982 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -229,9 +229,9 @@ hex2 linker.")
(license gpl3+)
(define-public mes-boot
- (let ((version "0.15")
-(revision "2")
-(commit "ddcb6e186672d67f1739210240f38d195c47cc16"))
+ (let ((version "0.16")
+(revision "0")
+(commit "f9a4e219727bedd504ea49885c3260c38755c1d0"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -244,7 +244,7 @@ hex2 linker.")
"/mes-" commit ".tar.gz"))
(sha256
(base32
- "00i8b8s9b5lqlcaf195h0lpag3wmjisr1bcnp434cnhkicdl01q9"
+ "1rvk2drps0g0klljw190ljpfd28bfpw9iw2n6s3lrw6ch7x8jgpn"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
81/163: REMOVEME: %fake-bootstrap => #t.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 739ffc789e14886db521473b426fe8fd3aeb38fb Author: Jan Nieuwenhuizen Date: Sat Jun 2 11:14:22 2018 +0200 REMOVEME: %fake-bootstrap => #t. --- gnu/packages/mes.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 99d66a8..1805c4a 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -43,7 +43,7 @@ #:use-module (guix utils) #:use-module (guix gexp)) -(define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up? +(define %fake-bootstrap? #t) ; cheat using Guile instead of Mes for speed-up? (define %mescc-tools-seed (let ((commit"32881b9ff21fb41dc846914753b6cdadd75927c4"))
57/163: gnu: %mes-seed: Update for 0.15.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit db850fd0c10163917d1e1b8d5553fa7e65716129 Author: Jan Nieuwenhuizen Date: Mon May 28 19:10:48 2018 +0200 gnu: %mes-seed: Update for 0.15. * gnu/packages/mes.scm (%mes-seed): Update for 0.15. --- gnu/packages/mes.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 32e52ba..f4a496b 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -51,7 +51,7 @@ "0p5lk4wnb56jxmxxfdx31wgakhhid9xqsimf19c4pnvwlzpm4wan") (define %mes-seed - (let ((commit "86e555fe9e58529b8ee2dd819f233c6e2dba063b")) + (let ((commit "c4a2ee984a862b0285866dc415fd82c285d77159")) (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes-seed; @@ -59,7 +59,7 @@ "/mes-seed-" commit ".tar.gz")) (sha256 (base32 -"11ixdy0a979lsnwbvpf12mhjd0l76gnpbk3wlpsja681ld0xh4g3") +"10rzfcjawcc97r0hc7b5m42z5bhaljbmwrnm7xsrliy6s881vz8s") (define %tinycc-seed (let ((commit "b677978374f13d9fa39f08ae9e6b71d328c562ae"))
90/163: gnu: glibc-boot: Install all headers. WIP plus more
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 22da1ec9a3f196631018b67399e5715b4bf4d01f
Author: Jan Nieuwenhuizen
Date: Sun Jun 17 20:48:13 2018 +0200
gnu: glibc-boot: Install all headers. WIP plus more
* gnu/packages/mes.scm (glibc-boot): Install all headers.
---
gnu/packages/mes.scm| 33 +---
gnu/packages/patches/glibc-boot-2.2.5.patch | 118 +---
2 files changed, 132 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index bf40cab..ff9ec3d 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -693,9 +693,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
(base32
"1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"
(supported-systems '("i686-linux"))
-(native-inputs `(("binutils" ,binutils-boot)
- ("gcc" ,gcc-core-boot)))
-(propagated-inputs `(("kernel-headers" ,(linux-libre-headers-boot0
+(native-inputs `(("binutils" ,binutils-boot0)
+ ("gcc" ,gcc-core-boot)
+ ("kernel-headers" ,(linux-libre-headers-boot0
(outputs '("out"))
(arguments
`(#:tests? #f
@@ -718,7 +718,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
"--without-gd"
"--without-tls"
(string-append "--prefix=" out)))
- #:make-flags '("lib")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'setenv
@@ -728,11 +727,29 @@ ac_cv_c_float_format='IEEE (little-endian)'
(gcc (assoc-ref %build-inputs "gcc"))
(cppflags (string-append
" -D __STDC__=1"
- " -D MES_BOOTSTRAP=1"))
+ " -D MES_BOOTSTRAP=1"
+ " -D BOOTSTRAP_GLIBC=1"))
(cflags (string-append " -L " (getcwd
(setenv "CONFIG_SHELL" (string-append
(assoc-ref %build-inputs "bash")
"/bin/sh"))
+
+ (setenv "PATH"
+ (string-append
+(assoc-ref %build-inputs "binutils") "/bin"
+":" (assoc-ref %build-inputs "gcc") "/bin"
+
+;; more bootstrap cheats
+":" (assoc-ref %build-inputs "bash") "/bin"
+":" (assoc-ref %build-inputs "coreutils") "/bin"
+":" (assoc-ref %build-inputs "diffutils") "/bin"
+":" (assoc-ref %build-inputs "gawk") "/bin"
+":" (assoc-ref %build-inputs "grep") "/bin"
+":" (assoc-ref %build-inputs "gzip") "/bin"
+":" (assoc-ref %build-inputs "make") "/bin"
+":" (assoc-ref %build-inputs "sed") "/bin"
+":" (assoc-ref %build-inputs "tar") "/bin"))
+
(setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags))
(setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
(unsetenv "C_INCLUDE_PATH")
@@ -742,11 +759,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
(zero?
- (apply system* "./configure" configure-flags
- (replace 'install
- (lambda* (#:key make-flags #:allow-other-keys)
- (zero?
- (apply system* "make" "install-lib-all" "install-headers"
make-flags)
+ (apply system* "./configure" configure-flags)
(define-public gcc-boot
(package
diff --git a/gnu/packages/patches/glibc-boot-2.2.5.patch
b/gnu/packages/patches/glibc-boot-2.2.5.patch
index e8b9c52..34932f8 100644
--- a/gnu/packages/patches/glibc-boot-2.2.5.patch
+++ b/gnu/packages/patches/glibc-boot-2.2.5.patch
@@ -1,4 +1,4 @@
-odiff -purN -x .git -x Makefile -x config.status -x config.h -x BOOT -x
BOOT-GCC -x texis -x '*.info*' ../glibc-2.2.5/adiff glibc-2.2.5/adiff
+cdiff -purN -x .git -x fubar -x fubar.c -x Makefile -x config.status -x
config.h -x BOOT -x BOOT-GCC -x texis -x '*.info*' ../glib
39/163: gnu: %tinycc-seed: Update for mes-0.12.
janneke pushed a commit to branch wip-bootstrap in repository guix. commit baed75254c3fab84973b64ca224f5a69af0afe5b Author: Jan Nieuwenhuizen Date: Sun Apr 8 18:09:49 2018 +0200 gnu: %tinycc-seed: Update for mes-0.12. * gnu/packages/mes.scm (%tinycc-seed): Update for mes-0.12. --- gnu/packages/mes.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 586cb75..7e5b914 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -66,11 +66,11 @@ (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed; "/repository/archive.tar.gz?ref=" -"f3637ca76c2a8f27a2d925c821946803bff1a5d2")) +"f23975bc49704d56539b3707d8afc17eaa955356")) (file-name (string-append "tinycc-seed" "-" "0.9.26" ".tar.xz")) (sha256 (base32 - "1xfn2hh497ck2syw380x3a7as03yf7r0z561qr50sav8gibv7vj1" + "0b7jpzwrf4adn1wwffll5hi775f7a2d8jimcm48agkj1sd9j6r20" (define %srfi-43 (origin @@ -344,7 +344,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public tcc-boot (let ((version "0.9.26") (revision "0") -(commit "4dc14198a84576ffd36ba7c4b3d4ebb743f2e96f")) +(commit "83293537ac710ecfa8b117d2363f6f9de5c04c0d")) (package-with-bootstrap-guile (package (name "tcc-boot")
38/163: gnu: mes-boot: Update to 0.12.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit c4b87450cb16ca040a9e5316236aa231190a797f
Author: Jan Nieuwenhuizen
Date: Sun Apr 8 16:20:55 2018 +0200
gnu: mes-boot: Update to 0.12.
* gnu/packages/mes.scm (mes-boot): Update to 0.12.
---
gnu/packages/mes.scm | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index a8263aa..586cb75 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -226,9 +226,9 @@ hex2 linker.")
(license gpl3+)
(define-public mes-boot
- (let ((version "0.11")
+ (let ((version "0.12")
(revision "0")
-(commit "24d3726ae112bfb2e28650286139822785ab2a0a"))
+(commit "96f02cd608a5669081cafd52beaef70b02f5e248"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -242,7 +242,7 @@ hex2 linker.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
- "0j4700cmf1lvqlbrx707r6kns1rd43ixdzlms8h0y2xd8hqpy80z"
+ "0b7q9inlwizssiz9wfqjqs7pb4xqfnsgfw4cz6anj6gm6xr28fqb"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
@@ -292,15 +292,19 @@ hex2 linker.")
(setenv "GUILE_LOAD_COMPILED_PATH"
(string-append guile "/lib/guile/2.0/ccache"))
(setenv "GUILE_LOAD_PATH"
- (string-append dir
- ":" guile "/share/guile/2.0/"
- ":" dir "/nyacc-source/module"))
+ (string-append "../nyacc-source/module"
+ ":" dir
+ ":" guile "/share/guile/2.0/"))
;; give auto-compile a home -- massive speed-up
(mkdir-p "/tmp/home")
(setenv "HOME" "/tmp/home")
(and
(zero? (system* "sh" "build.sh"))
- (zero? (system* "sh" "check.sh"))
+ (begin
+ (setenv "MES" "src/mes")
+ (setenv "MES_MODULEDIR" "module")
+ (setenv "MESCC" "scripts/mescc.mes")
+ (zero? (system* "sh" "check.sh")))
(zero? (system* "sh" "install.sh")))
(description
"Mes [Maxwell Equations of Software] aims to create full source
94/163: gnu: tcc-boot0: Update for mes 0.16.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 6d863372ae278414f9665fe5b228f226fb133254
Author: Jan Nieuwenhuizen
Date: Sun Jun 24 12:57:41 2018 +0200
gnu: tcc-boot0: Update for mes 0.16.
* gnu/packages/mes.scm (tcc-boot): Update for mes 0.16.
---
gnu/packages/mes.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index ffb32c9..ed141e1 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -376,8 +376,8 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(define-public tcc-boot0
(let ((version "0.9.26")
-(revision "1")
-(commit "c73a151c4d0878f387de0c87ec77484626a7a888"))
+(revision "2")
+(commit "7da187d180e3c7a2d63e7f1f9c21cbc429d50bed"))
(package-with-bootstrap-guile
(package
(name "tcc-boot0")
@@ -390,7 +390,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
"/tinycc-" commit ".tar.gz"))
(sha256
(base32
- "0sxvdj06a21a4a305k0pz4nb36vrcdjqv9xsb8dm06a8j1iqjkx9"
+ "0hrxcjxwkqwifipj34wp3qfc7yh06hsavmggcg5ib5x5k9pcksqm"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
21/163: gnu: Update mes-boot: Mescc-tools support: char foo[BAR] = {'a', 'b', 'c'}.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 960bf6bf3aa10610b66ad4660af6df67a92612cf
Author: Jan Nieuwenhuizen
Date: Tue Nov 28 20:06:37 2017 +0100
gnu: Update mes-boot: Mescc-tools support: char foo[BAR] = {'a', 'b', 'c'}.
* gnu/packages/mes.scm (mes-boot): Mescc-tools support: char foo[BAR] =
{'a',
'b', 'c'}.
---
gnu/packages/mes.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 3ded1c8..0a5cc03 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -207,7 +207,7 @@ hex2 linker.")
(define-public mes-boot
(let ((version "0.11")
(revision "0")
-(commit "b67de7d4006cb451db7af75f47865ea927412edb"))
+(commit "7bb64cbfd2dbea9fd4146ff6bc0c56925af14ad7"))
(package-with-bootstrap-guile
(package
(name "mes-boot")
@@ -221,7 +221,7 @@ hex2 linker.")
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
- "1r0x79kdwf7nzsi6r5c5x0psb0jvsix3spbvk26f6clq5zk7rq4x"
+ "0i8x3501yi5glf56krfpra5854drm43231hiidxavq4hasnfn77j"
(build-system trivial-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(native-inputs
02/163: gnu: Add mescc-tools-boot.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit e98e6a275c671750590e5e75456fd791f37dc52f
Author: Jan Nieuwenhuizen
Date: Sun Nov 19 11:35:59 2017 +0100
gnu: Add mescc-tools-boot.
* gnu/packages/mes.scm (mescc-tools-boot): New variable.
---
gnu/packages/mes.scm | 101 +++
1 file changed, 101 insertions(+)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 603..1bc5cd3 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -111,6 +111,107 @@ with a Knight VM that runs Forth and Lisp.")
(home-page "https://savannah.nongnu.org/projects/stage0/;)
(license gpl3+
+(define-public mescc-tools-boot
+ (let ((version "0.2")
+(revision "0")
+(commit "3882f30b62b73c7005408fc2dccc82280e79b659"))
+ (package
+(name "mescc-tools-boot")
+(version (string-append version "-" revision "." (string-take commit 7)))
+(synopsis "Tools for the full source bootstrapping process")
+(source (origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.com/janneke/mescc-tools;
+ "/repository/archive.tar.gz?ref="
+ commit))
+ (file-name (string-append name "-" version ".tar.xz"))
+ (sha256
+ (base32
+"0hrc18dshwp9bbimckj9inx04zxnw4a2m5hq3vkyw8hab8jyd2gw"
+(native-inputs
+ `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
+ ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
+ ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
+ ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+ ("stage0" ,stage0-boot)
+ ("mescc-tools-seed"
+,(origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed;
+ "/repository/archive.tar.gz?ref="
+ "b0f8fd0e31c41cb91aefd17047da1f5743370e4b"))
+ (file-name (string-append name "-seed" "-" version ".tar.xz"))
+ (sha256
+(base32
+ "065nmxpp73hnynqil0f1d3cgldkfpx64zach1i31iz05f9xy3yzn"
+ ("mes-source" ,(package-source mes-boot))
+ ("mes-seed"
+,(origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.com/janneke/mes-seed;
+ "/repository/archive.tar.gz?ref="
+ "7ed68e26db72884dc287852e021858c28ce1c557"))
+ (file-name (string-append "mes-seed-0.11" ".tar.xz"))
+ (sha256
+(base32
+ "1pknfxdynn8gv1xnwfwqbpgqmi0j80yvj2n20y2lq3rhmmyhz81b"))
+(supported-systems '("i686-linux" "x86_64-linux"))
+(build-system trivial-build-system)
+(arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((bash (assoc-ref %build-inputs "static-bash"))
+(tar (assoc-ref %build-inputs "tar"))
+(xz (assoc-ref %build-inputs "xz"))
+(source (assoc-ref %build-inputs "source"))
+(mescc-tools-seed (assoc-ref %build-inputs "mescc-tools-seed"))
+(mes-seed (assoc-ref %build-inputs "mes-seed"))
+(mes-source (assoc-ref %build-inputs "mes-source"))
+(out (assoc-ref %outputs "out"))
+(out/bin (string-append out "/bin")))
+ (setenv "PATH" (string-append bash "/bin:"
+ "../mescc-tools-seed:"
+ tar "/bin:"
+ xz "/bin"))
+ (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
+ (mkdir-p "source")
+ (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
+ (mkdir-p "mescc-tools-seed")
+ (system* "tar" "--strip=1" "-C" "mescc-tools-seed" "-xvf"
mescc-tools-seed)
+ (mkdir-p "mes-source")
+ (system* "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source)
+ (mkdir-p "mes-seed")
+ (system* &quo
07/163: Revert "use %bootstrap-guile -- still guile-2.2 in bag-with-origins :-("
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 3522a647e885d94840fe3ce88e0ed4d653a62b95
Author: Jan Nieuwenhuizen
Date: Fri Nov 24 22:43:41 2017 +0100
Revert "use %bootstrap-guile -- still guile-2.2 in bag-with-origins :-("
This reverts commit 80f5579a365b7475300f6f4a7e677cce07ed3b23.
---
gnu/packages/mes.scm | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index ab49998..18c3e22 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -74,8 +74,7 @@
(supported-systems '("i686-linux" "x86_64-linux"))
(build-system trivial-build-system)
(arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
+ `(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
@@ -160,8 +159,7 @@ with a Knight VM that runs Forth and Lisp.")
(supported-systems '("i686-linux" "x86_64-linux"))
(build-system trivial-build-system)
(arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
+ `(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
@@ -251,8 +249,7 @@ hex2 linker.")
(base32
"1pknfxdynn8gv1xnwfwqbpgqmi0j80yvj2n20y2lq3rhmmyhz81b"))
(arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
+ `(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
@@ -383,8 +380,7 @@ extensive examples, including parsers for the Javascript
and C99 languages.")
(base32
"0l276qwda166lm27w0yv37wisdgxx2giv8b5lsbynyf3ax7045mf"))
(arguments
- `(#:guile ,%bootstrap-guile
- #:modules ((guix build utils))
+ `(#:modules ((guix build utils))
#:builder
(begin
(use-modules (guix build utils))
branch wip-bootstrap deleted (was d6360f7)
janneke pushed a change to branch wip-bootstrap in repository guix. was d6360f7 HACK: try to add glibc-mesboot-2.3.6 ... really problematic This change permanently discards the following revisions: discards d6360f7 HACK: try to add glibc-mesboot-2.3.6 ... really problematic discards 12433be gnu: Add mpc-boot 1.0.3. discards 7cee0a9 gcc-mesboot: use package-full-name "-" :-) discards 4524611 gnu: Add make-mesboot0 3.80 discards 5d774f2 Revert "gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball." discards 8420429 Revert "gnu: Add %bootstrap-make." discards ed36a53 Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball." discards adfff13 Revert "gnu: Add %bootstrap-diffutils." discards 3090d6d bootstrap: Remove dependency on %bootstrap-make, %bootstrap-diffutils. discards 36ecc87 gnu: make-mesboot: Update to 3.80. discards 87453f2 gnu: Add diffutils-mesboot 2.7. discards a7c408f gnu: Add make-mesboot 3.79. discards 48879d8 gnu: tcc-boot: Update for mes 0.18. WIP discards 0c4285a gnu: mes-boot: Update to 0.18. WIP discards cb13e50 gnu: %tinycc-seed: Update for mes 0.18. WIP discards 97b99ec gnu: %mes-seed: Update for mes 0.18. WIP discards dd025a6 bootstrap: Integrate mes bootstrap for i686-linux. discards f6c7dd4 gnu: bootstrap-tarballs: Update inputs for i686-linux. discards 2875c88 gnu: Add %bootstrap-linux-libre-headers. discards 89051cd gnu: Add %linux-libre-headers-stripped, %linux-libre-headers-bootstrap-tarball. discards 611cefc gnu: Add %bootstrap-diffutils. discards 8683d17 gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball. discards cc60acb gnu: Add %bootstrap-make. discards 0a8298e gnu: Add %make-static, %make-static-stripped, %make-bootstrap-tarball. discards 8c50288 gnu: tcc-boot: Use gnu-build-system. discards 7f4bca3 gnu: tcc-boot0: Use gnu-build-system. discards 2309ad8 gnu: mes-boot: Use gnu-build-system. discards ceef3a8 gnu: mescc-tools-boot: Use gnu-build-system. discards a37c252 bootstrap: Move mes seeds to bootstrap.scm discards 97b5d49 gnu: tcc-boot0: Update for mes 0.17. discards 0cdef9b gnu: mes: Update to 0.17. discards 6d3a6e7 gnu: %tinycc-seed: Update for mes 0.17. discards ddac967 gnu: %mes-seed: Update for mes 0.17. discards 2077dc0 gnu: gcc-mesboot: Revise dependencies. discards 7f7d774 gnu: binutils-mesboot: Revise dependencies. discards 9644890 gnu: gcc-mesboot0: Revise dependencies. discards 0d0513e gnu: glibc-mesboot: Revise dependencies. discards f98e971 gnu: gcc-core-mesboot: Revise dependencies. discards ccb93bb gnu: binutils-mesboot0: Revise dependencies. discards f1128b9 gnu: tcc-boot: Revise dependencies. discards 56a6a44 gnu: tcc-boot0: Revise dependencies. discards 0cc8fd3 gnu: mes-boot: Update to 0.16.1; revise dependencies. discards f54dd96 gnu: %mes-seed: Update for mes 0.16.1. discards f9e167c gnu: mescc-tools-boot: Revise dependencies. discards 1ad68c8 gnu: Remove gcc-mesboot-4.1.0. discards 034b6a9 gnu: gcc-mesboot0: Package with bootstrap-guile. discards d67ce17 gnu: glibc-mesboot: Package with bootstrap-guile. discards 9249903 gnu: gcc-core-mesboot: Package with bootstrap-guile. discards c28cd5a gnu: binutils-mesboot0: Package with bootstrap-guile. discards eca4d2e gnu: tcc-boot: Package with bootstrap-guile. discards a92d237 gnu: m4-mesboot: Package with boostrap-guile. discards b820beb Revert "REMOVEME: %fake-bootstrap => #t." discards 101db8d REMOVEME: %fake-bootstrap => #t. discards 2daa205 gnu: Add gcc-mesboot 4.7.4. WIP discards c981fa7 gnu: Add gcc-mesboot 4.1.0. discards 7190b65 Revert: gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries. discards 07ed841 gnu: binutils-mesboot: Rename from binutils-boot. discards c9f9004 gnu: gcc-mesboot: Rename from gcc-boot. discards 2162aa6 gnu: glibc-mesboot: Rename from glibc-boot. discards 5725fb9 gnu: gcc-core-mesboot: Rename from gcc-core-boot. discards f2b20ba gnu: binutils-mesboot0: Rename from binutils-boot0. discards 9663caf gnu: m4:mesboot: Rename from m4-boot. discards f178a40 gnu: Remove binutils-boot0-cheat. discards fe74bd1 gnu: binutils-boot0: Inject AR,LD from bootstrap-binaries. discards eeacb03 gnu: gcc-boot: build with %cheat-binutils? discards de4e174 gnu: Add binutils-boot0-cheat. discards 1914d86 gnu: binutils-boot: Update to 2.20.1a. discards 6d86337 gnu: tcc-boot0: Update for mes 0.16. discards cc98215 gnu: Add tcc-boot 0.9.27. discards e4f7217 gnu: Add binutils-boot 2.20.1, built with gcc+glibc. discards bbc9a35 gnu: gcc-core-boot: Install libgcc2.a too. discards 22da1ec gnu: glibc-boot: Install all headers. WIP
155/163: Revert "gnu: Add %diffutils-static, %diffutils-static-stripped, %diffutils-bootstrap-tarball."
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit ed36a53fb8fdd0f7948e46e7ef552e41a3cdccd4
Author: Jan Nieuwenhuizen
Date: Tue Aug 28 01:14:28 2018 +0200
Revert "gnu: Add %diffutils-static, %diffutils-static-stripped,
%diffutils-bootstrap-tarball."
This reverts commit f7234aef5c3cb38b3ccd6c287be3fad57ddc9d25.
---
gnu/packages/make-bootstrap.scm | 52 -
1 file changed, 52 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 2062f86..cb3e8d4 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -41,7 +41,6 @@
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:export (%bootstrap-binaries-tarball
-%diffutils-bootstrap-tarball
%make-bootstrap-tarball
%linux-libre-headers-bootstrap-tarball
%binutils-bootstrap-tarball
@@ -303,53 +302,6 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(license gpl3+)
(home-page #f)))
-(define %diffutils-static
- ;; Statically-linked Diffutils.
- (package
-(inherit diffutils)
-(name "diffutils-static")
-(arguments
- `(#:strip-flags '("--strip-all")
- #:make-flags '("V=2")
- #:phases (modify-phases %standard-phases
- (add-before 'configure 'all-static
-(lambda _
- ;; The `-all-static' libtool flag can only be passed
- ;; after `configure', since configure tests don't use
- ;; libtool, and only for executables built with libtool.
- (substitute* '("Makefile.in"
- "src/Makefile.in")
-(("^LDFLAGS =(.*)$" line)
- (string-append line
-"\nAM_LDFLAGS = -static\n"))
-
-(define %diffutils-static-stripped
- ;; The subset of Diffutils that we need.
- (package (inherit %diffutils-static)
-(name (string-append (package-name %diffutils-static) "-stripped"))
-(build-system trivial-build-system)
-(outputs '("out"))
-(arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
-
- (setvbuf (current-output-port) _IOLBF)
- (let* ((in (assoc-ref %build-inputs "diffutils"))
-(out (assoc-ref %outputs "out"))
-(bin (string-append out "/bin")))
- (mkdir-p bin)
- (for-each (lambda (file)
- (let ((target (string-append bin "/" file)))
- (format #t "copying `~a'...~%" file)
- (copy-file (string-append in "/bin/" file)
-target)
- (remove-store-references target)))
- '("cmp" "diff"))
- #t
-(inputs `(("diffutils" ,%diffutils-static)
-
(define %make-static
;; Statically-linked Make.
(package
@@ -771,10 +723,6 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
;; A tarball with the statically-linked bootstrap binaries.
(tarball-package %static-binaries))
-(define %diffutils-bootstrap-tarball
- ;; A tarball with the statically-linked Diffutils programs.
- (tarball-package %diffutils-static-stripped))
-
(define %make-bootstrap-tarball
;; A tarball with the statically-linked Make programs.
(tarball-package %make-static-stripped))
161/163: gnu: make-boot0: Set LOADLIBES for i686-linux.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 8e1977169c1bdb1236c147c93bdfe2ac77c91bd5
Author: Jan Nieuwenhuizen
Date: Tue Aug 28 23:12:59 2018 +0200
gnu: make-boot0: Set LOADLIBES for i686-linux.
* gnu/packages/commencement.scm (gnu-make-boot0): Set LOADLIBES for
i686-linux.
---
gnu/packages/commencement.scm | 28 ++--
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 6779502..7cc1ef9 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1398,16 +1398,24 @@ ac_cv_c_float_format='IEEE (little-endian)'
,@(substitute-keyword-arguments (package-arguments gnu-make)
((#:phases phases)
`(modify-phases ,phases
-(replace 'build
- (lambda _
-(invoke "./build.sh")
-#t))
-(replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
-(let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin")))
- (install-file "make" bin)
- #t
+,@(append
+ (match (%current-system)
+ ("i686-linux"
+ '((add-before 'build 'configure-fixup
+ (lambda _
+(substitute* "build.sh"
+ (("^LOADLIBES=.*") "LOADLIBES='-ldl -lc
-lnss_files -lnss_dns -lresolv'\n"))
+ (_ '()))
+ '((replace 'build
+ (lambda _
+ (invoke "./build.sh")
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+(bin (string-append out "/bin")))
+ (install-file "make" bin)
+ #t))
(native-inputs '()); no need for 'pkg-config'
(inputs %bootstrap-inputs+toolchain
133/163: bootstrap: Move mes seeds to bootstrap.scm
janneke pushed a commit to branch wip-bootstrap in repository guix. commit a37c252aad91eb32ca143d915d5396e325cc5096 Author: Jan Nieuwenhuizen Date: Thu Aug 23 17:31:02 2018 +0200 bootstrap: Move mes seeds to bootstrap.scm * gnu/packages/bootstrap.scm (%mescc-tools-seed): Move from gnu/packages/mes.scm. (%mes-seed): Likewise. (%tinycc-seed): Likewise. (%srfi-43): Likewise. * gnu/packages/mes.scm: Remove them. --- gnu/packages/bootstrap.scm | 48 +- gnu/packages/mes.scm | 42 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 936d6c1..70d6f13 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -46,7 +46,11 @@ %bootstrap-binutils %bootstrap-gcc %bootstrap-glibc -%bootstrap-inputs)) +%bootstrap-inputs +%mescc-tools-seed +%mes-seed +%srfi-43 +%tinycc-seed)) ;;; Commentary: ;;; @@ -586,6 +590,48 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ + (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) +(origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed; + "/-/archive/" commit + "/mescc-tools-seed-" commit ".tar.gz")) + (sha256 + (base32 +"0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v") + +(define %mes-seed + (let ((commit "9f4b5f3023b9719f6dec61b96cbfc9b327fc7bd8")) +(origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mes-seed; + "/-/archive/" commit + "/mes-seed-" commit ".tar.gz")) + (sha256 + (base32 +"1gyh16bymld897s5zzxd8zj3gqwfgvihblqg6rd177lw176aj821") + +(define %tinycc-seed + (let ((commit "546500b97fb07147add1bc4aef2c10899f6a4306")) +(origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc-seed; + "/-/archive/" commit + "/tinycc-seed-" commit ".tar.gz")) + (sha256 + (base32 +"0803x488jbc2xv68pk633krfxnhyh6k56cmnyiva547m02r0z32h") + +(define %srfi-43 + (origin +(method url-fetch) +(uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0;) +(file-name "srfi-43.scm") +(sha256 + (base32 + "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb" + (define %bootstrap-inputs ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 4c0a9c8..62857cb 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -46,48 +46,6 @@ (define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up? -(define %mescc-tools-seed - (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) -(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed; - "/-/archive/" commit - "/mescc-tools-seed-" commit ".tar.gz")) - (sha256 - (base32 -"0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v") - -(define %mes-seed - (let ((commit "9f4b5f3023b9719f6dec61b96cbfc9b327fc7bd8")) -(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes-seed; - "/-/archive/" commit - "/mes-seed-" commit ".tar.gz")) - (sha256 - (base32 -"1gyh16bymld897s5zzxd8zj3gqwfgvihblqg6rd177lw176aj821") - -(define %tinycc-seed - (let ((commit "546500b97fb07147add1bc4aef2c10899f6a4306")) -(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/tinycc-seed; - "/-/archive/" commit - "/tinycc-seed-" commit ".tar.gz")) - (sha256 - (base32 -"0803x488jbc2xv68pk633krfxnhyh6k56cmnyiva547m02r0z32h") - -(define %srfi-43 - (origin -(method url-fetch) -(uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0;) -(file-name "srfi-43.scm") -(sha256 - (base32 - "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb" - (define-public stage0-boot (let ((version "0.0.8") (revision "0")
149/163: gnu: tcc-boot: Update for mes 0.18. WIP
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 48879d851a29e82902d758a2a5974fdccdae97a5
Author: Jan Nieuwenhuizen
Date: Mon Aug 27 01:15:13 2018 +0200
gnu: tcc-boot: Update for mes 0.18. WIP
* gnu/packages/commencement.scm (tcc-boot): Update for mes 0.18.
---
gnu/packages/commencement.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index f1e362d..1846041 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -309,7 +309,7 @@
(define-public tcc-boot0
(let ((version "0.9.26")
(revision "2")
-(commit "1f518eab9a5409006b356a5395bba35ea13d0140"))
+(commit "b7aa90652065279b580a414735a4363ae9112d0a"))
(package-with-bootstrap-guile
(package
(inherit tcc)
@@ -323,7 +323,7 @@
"/tinycc-" commit ".tar.gz"))
(sha256
(base32
- "0jkv9shhn5s4zqsvnjwwp2np2wg5v8ypsj5s4hb8yr1cjqqv2z9s"
+ "1sjf1alahn2as5mv0y5v25npajirg1y7szsn7sfgq5g22vvaisx5"
(build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux"))
(inputs '())
153/163: bootstrap: Remove dependency on %bootstrap-make, %bootstrap-diffutils.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 3090d6db6f6aba119c820d99aafa3f5da6ee7315
Author: Jan Nieuwenhuizen
Date: Tue Aug 28 01:09:14 2018 +0200
bootstrap: Remove dependency on %bootstrap-make, %bootstrap-diffutils.
* gnu/packages/bootstrap.scm (%bootstrap-inputs): Remove %bootstrap-make,
%bootstrap-diffutils.
* gnu/packages/make-bootstrap.scm (%bootstrap-tarballs): Remove
%make-bootstrap-tarball, %diffutils-bootstrap-tarball.
* gnu/packages/commencement.scm (diffutils-mesboot): Replace %bootstrap-make
with make-mesboot.
(binutils-mesboot0): Likewise. Replace %bootstrap-diffutils with
diffutils-mesboot.
(gcc-core-mesboot): Likewise.
(glibc-mesboot): Likewise.
(gcc-mesboot0): Likewise.
(binutils-mesboot): Likewise.
(gcc-mesboot): Likewise.
---
gnu/packages/bootstrap.scm | 4 +---
gnu/packages/commencement.scm | 28 +++-
gnu/packages/make-bootstrap.scm | 4 +---
3 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 778f162..631faee 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -735,9 +735,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
;; The initial, pre-built inputs. From now on, we can start building our
;; own packages.
`(,@(match (%current-system)
-("i686-linux" `(("diffutils" ,%bootstrap-diffutils)
-("linux-libre-headers" ,%bootstrap-linux-libre-headers)
-("make" ,%bootstrap-make)
+("i686-linux" `(("linux-libre-headers" ,%bootstrap-linux-libre-headers)
("mescc-tools-seed" ,%mescc-tools-seed)
("mes-seed" ,%mes-seed)
("srfi-43" ,%srfi-43 )
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b377af2..79b606d 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -627,10 +627,11 @@
("bash" ,%bootstrap-coreutils)
("coreutils" ,%bootstrap-coreutils)
- ("make" ,%bootstrap-make)))
+ ("make" ,make-mesboot)))
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
+#:parallel-build? #f
;;FIXME: why doesn't this work?
;;#:make-flags '("PROGRAMS=\"cmp diff\"")
#:tests? #f ; check is naive, also checks non-built PROGRAMS
@@ -674,8 +675,8 @@
(native-inputs `(("tcc" ,tcc-boot)
("coreutils" ,%bootstrap-coreutils)
- ("diffutils" ,%bootstrap-diffutils)
- ("make" ,%bootstrap-make)))
+ ("diffutils" ,diffutils-mesboot)
+ ("make" ,make-mesboot)))
(supported-systems '("i686-linux"))
(arguments
`(#:implicit-inputs? #f
@@ -751,8 +752,8 @@
("tcc" ,tcc-boot)
("coreutils" ,%bootstrap-coreutils)
- ("diffutils" ,%bootstrap-diffutils)
- ("make" ,%bootstrap-make)))
+ ("diffutils" ,diffutils-mesboot)
+ ("make" ,make-mesboot)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -873,9 +874,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
("gcc" ,gcc-core-mesboot)
("coreutils" ,%bootstrap-coreutils)
- ("diffutils" ,%bootstrap-diffutils)
+ ("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,%bootstrap-make)))
+ ("make" ,make-mesboot)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -964,9 +965,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
("libc" ,glibc-mesboot)
("coreutils" ,%bootstrap-coreutils)
- ("diffutils" ,%bootstrap-diffutils)
+ ("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,%bootstrap-make)))
+ ("make" ,make-mesboot)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -1060,13 +1061,14 @@ ac_cv_c_float_format='IEEE (little-endian)'
(&q
148/163: gnu: mes-boot: Update to 0.18. WIP
janneke pushed a commit to branch wip-bootstrap in repository guix. commit 0c4285a7d8b788df380ced33fb1efb7c539b727e Author: Jan Nieuwenhuizen Date: Mon Aug 27 01:13:35 2018 +0200 gnu: mes-boot: Update to 0.18. WIP * gnu/packages/commencement.scm (mes-boot): Update to 0.18. --- gnu/packages/commencement.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 211dddf..f1e362d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -86,8 +86,8 @@ (define mes-boot0 (let ((version "0.17") -(revision "0") -(commit #f)) +(revision "1") +(commit "8a8a8a8e3a6640cb922edfacfbbf11f6b94a2405")) (package (inherit mes) (name "mes-boot0") @@ -101,7 +101,7 @@ "/mes-" commit ".tar.gz")) (sha256 (base32 - "02nakd20pnpgc1fq23r76ys23h150lg4fwjv5sqzza5dn66s60a6"))) + "1dfnchrz3fb8x220bz28i6p3ql2xfahk9mzin3vk8lyw45s12r5g"))) (origin (method url-fetch) (uri (string-append "http://alpha.gnu.org/gnu/mes/;
160/163: gnu: Add mpc-boot 1.0.3.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 12433be6b769647d609737cbb1b5845ec5ae95d3
Author: Jan Nieuwenhuizen
Date: Tue Aug 28 15:17:39 2018 +0200
gnu: Add mpc-boot 1.0.3.
* gnu/packages/commencement.scm (mpc-boot): New variable.
(gcc-mesboot): Use it.
---
gnu/packages/commencement.scm | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5cae2d4..6779502 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1185,6 +1185,18 @@ ac_cv_c_float_format='IEEE (little-endian)'
(sha256 (base32
"0dxn4904dra50xa22hi047lj8kkpr41d6vb9sd4grca880c7wv94"))
+(define mpc-boot
+ (package
+(inherit mpc)
+(version "1.0.3")
+(source (origin
+ (method url-fetch)
+ (uri (string-append
+"mirror://gnu/mpc/mpc-" version ".tar.gz"))
+ (sha256
+ (base32
+"1hzci2zrrd7v3g1jk35qindq05hbl0bhjcyyisq9z209xb3fqzb1"))
+
(define-public gcc-mesboot
(package-with-bootstrap-guile
(package
@@ -1202,7 +1214,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
"06bqygv17f71f7g7pi7ddvhljcr8dimrypgiif9g1r6lqn1sbfnx"
(inputs `(("gmp-source" ,(package-source gmp-boot))
("mpfr-source" ,(package-source mpfr-boot))
- ("mpc-source" ,(package-source mpc
+ ("mpc-source" ,(package-source mpc-boot
(propagated-inputs '())
(native-inputs `(("binutils" ,binutils-mesboot)
("gcc" ,gcc-mesboot0)
@@ -1287,7 +1299,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(package-full-name lib "-")
char-set:letter)
,(package-name lib)))
- (list gmp-boot mpfr-boot mpc))
+ (list gmp-boot mpfr-boot mpc-boot))
#t)))
(add-before 'configure 'setenv
145/163: bootstrap: Integrate mes bootstrap for i686-linux.
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit dd025a6879d0243f0f4c99faeeb54a8ff30ad70f
Author: Jan Nieuwenhuizen
Date: Thu Aug 23 17:34:05 2018 +0200
bootstrap: Integrate mes bootstrap for i686-linux.
* gnu/packages/commencement.scm (mescc-tools-boot nyacc-boot, mes-boot,
tcc-boot0, tcc-boot, binutils-mesboot0, gcc-core-mesboot, glibc-mesboot,
gcc-mesboot0, binutils-mesboot, gmp-boot, mpfr-boot, gcc-mesboot,
m4-mesboot): Move from gnu/packages/mes.scm, use
package-with-explicit-inputs.
(%bootstrap-inputs+toolchain): New variable. Update users of
%bootstrap-inputs.
* gnu/packages/mes.scm: Remove bootstrap packages.
---
gnu/packages/bootstrap.scm|1 +
gnu/packages/commencement.scm | 1167 -
gnu/packages/mes.scm | 1103 +-
3 files changed, 1160 insertions(+), deletions(-)
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 1786b8d..12e0a3b 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
;;; Copyright © 2014, 2015, 2018 Mark H Weaver
;;; Copyright © 2017 Efraim Flashner
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen
;;;
;;; This file is part of GNU Guix.
;;;
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index dde000a..211dddf 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2014, 2015, 2017 Mark H Weaver
;;; Copyright © 2017, 2018 Efraim Flashner
;;; Copyright © 2018 Tobias Geerinckx-Rice
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,6 +29,7 @@
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages c)
#:use-module (gnu packages gcc)
#:use-module (gnu packages m4)
#:use-module (gnu packages code)
@@ -39,6 +41,7 @@
#:use-module (gnu packages gettext)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages mes)
#:use-module (gnu packages perl)
#:use-module (gnu packages linux)
#:use-module (gnu packages hurd)
@@ -78,14 +81,1160 @@
;;;
;;; Code:
-(define gnu-make-boot0
+(define %fake-bootstrap? #t) ; cheat using Guile (instead of Mes) in MesCC
+ ; for speed-up?
+
+(define mes-boot0
+ (let ((version "0.17")
+(revision "0")
+(commit #f))
+(package
+ (inherit mes)
+ (name "mes-boot0")
+ (version (if commit (string-append version "-" revision "." (string-take
commit 7))
+ version))
+ (source (if commit
+ (origin
+(method url-fetch)
+(uri (string-append "https://gitlab.com/janneke/mes;
+"/-/archive/" commit
+"/mes-" commit ".tar.gz"))
+(sha256
+ (base32
+ "02nakd20pnpgc1fq23r76ys23h150lg4fwjv5sqzza5dn66s60a6")))
+ (origin
+(method url-fetch)
+(uri (string-append "http://alpha.gnu.org/gnu/mes/;
+"mes-" version ".tar.gz"))
+(sha256
+ (base32
+
"1j32x4zqy2cqjlg9m35f2411mwac2b0p5ch4hm99gddmfbxzgyhg")
+ (native-inputs '())
+ (propagated-inputs '()
+
+(define-public mescc-tools-boot
+ (let ((version "0.4")
+(revision "1")
+(commit "f02b8f4fda8d0c5c11a1d63a02b2bfdfab55abc5"))
+(package-with-bootstrap-guile
+ (package
+ (inherit mescc-tools)
+ (name "mescc-tools-boot")
+ (version (string-append version "-" revision "." (string-take commit
7)))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.com/janneke/mescc-tools;
+ "/-/archive/" commit
+ "/mescc-tools-" commit ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "14xw954ad4lnnyflgnwvzfhd3kqimniilzzyf4x23vljky2npkbf"
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs
+`(("mescc-tools-seed" ,%mescc-tools-seed)
+ ("mes-source" ,(package-source mes-boot0))
+
+ ("
162/163: gnu: Add glibc-mesboot 2.3.6. WIP
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 2052b65c40275da7954aeb2c64073485a81e18ff
Author: Jan Nieuwenhuizen
Date: Thu Aug 30 06:51:48 2018 +0200
gnu: Add glibc-mesboot 2.3.6. WIP
* gnu/packages/commencement.scm (glibc-headers-mesboot): New variable.
(glibc-mesboot0): Rename from glibc-mesboot.
(glibc-mesboot): WIP update to 2.3.6.
* gnu/packages/patches/glibc-boot-2.3.6.patch: New file. Not added to
local.mk yet; this may well dissappear/change again soon.
---
gnu/packages/commencement.scm | 273 -
gnu/packages/patches/glibc-boot-2.3.6.patch | 856
2 files changed, 1122 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7cc1ef9..aca46b8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -852,11 +852,11 @@ ac_cv_c_float_format='IEEE (little-endian)'
(copy-recursively (string-append tcc "/include")
(string-append out "/include"
-(define-public glibc-mesboot
+(define-public glibc-mesboot0
(package-with-bootstrap-guile
(package
(inherit glibc)
- (name "glibc-mesboot")
+ (name "glibc-mesboot0")
(version "2.2.5")
(source (origin
(method url-fetch)
@@ -903,6 +903,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
"--without-cvs"
"--without-gd"
"--without-tls"
+ ;; Build Sun/ONC RPC support. In particular,
+ ;; install rpc/*.h.
+ "--enable-obsolete-rpc"
(string-append "--prefix=" out)))
#:phases
(modify-phases %standard-phases
@@ -962,7 +965,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(propagated-inputs '())
(native-inputs `(("binutils" ,binutils-mesboot0)
("gcc" ,gcc-core-mesboot)
- ("libc" ,glibc-mesboot)
+ ("libc" ,glibc-mesboot0)
("coreutils" ,%bootstrap-coreutils)
("diffutils" ,diffutils-mesboot)
@@ -1034,9 +1037,9 @@ ac_cv_c_float_format='IEEE (little-endian)'
(and
(zero?
(system* "./configure"
- "--disable-shared"
"--build=i686-unknown-linux-gnu"
"--host=i686-unknown-linux-gnu"
+ "--disable-shared"
(string-append "--prefix=" out)))
(add-after 'install 'install2
(lambda* (#:key outputs #:allow-other-keys)
@@ -1057,7 +1060,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(inputs '())
(propagated-inputs '())
(native-inputs `(("binutils" ,binutils-mesboot0)
- ("libc" ,glibc-mesboot)
+ ("libc" ,glibc-mesboot0)
("gcc" ,gcc-mesboot0)
("coreutils" ,%bootstrap-coreutils)
@@ -1136,7 +1139,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(inputs '())
(propagated-inputs '())
(native-inputs `(("binutils" ,binutils-mesboot0)
- ("libc" ,glibc-mesboot)
+ ("libc" ,glibc-mesboot0)
("gcc" ,gcc-mesboot0)
("make" ,make-mesboot0)
@@ -1218,7 +1221,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(propagated-inputs '())
(native-inputs `(("binutils" ,binutils-mesboot)
("gcc" ,gcc-mesboot0)
- ("libc" ,glibc-mesboot)
+ ("libc" ,glibc-mesboot0)
("coreutils" ,%bootstrap-coreutils)
("diffutils" ,diffutils-mesboot)
@@ -1347,6 +1350,262 @@ ac_cv_c_float_format='IEEE (little-endian)'
(zero?
(apply system* "../configure" configure-flags))
+(define-public glibc-headers-mesboot
+ (package-with-bootstrap-guile
+ (package
+ (inherit glibc)
+ (name "glibc-headers-mesboot")
+ ;; (version "2.2.5")
+ ;; (version "2.3")
+ ;; (version "2.3.4")
+ (version "2.3.6")
+ ;; (version "2.4")
+ ;; (version "2.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/glibc/glibc-"
+ version
+
158/163: gnu: Add make-mesboot0 3.80
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 45246116e7fbaa44c2c14d3ce6d87cf2ca8eb98e
Author: Jan Nieuwenhuizen
Date: Tue Aug 28 10:35:32 2018 +0200
gnu: Add make-mesboot0 3.80
* gnu/packages/commencement.scm (make-mesboot0): Rename from make-mesboot.
Update users.
(make-mesboot): Build with gcc-mesboot0, binutils-mesboot0, glibc-mesboot.
(gcc-mesboot): Use it.
---
gnu/packages/commencement.scm | 52 ---
1 file changed, 44 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 79b606d..fa8dba2 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -546,11 +546,11 @@
(copy-file "libtcc1.a" (string-append out
"/lib/tcc/libtcc1.a"
-(define-public make-mesboot
+(define-public make-mesboot0
(package-with-bootstrap-guile
(package
(inherit gnu-make)
- (name "make-mesboot")
+ (name "make-mesboot0")
(version "3.80")
(source (origin
(method url-fetch)
@@ -627,7 +627,7 @@
("bash" ,%bootstrap-coreutils)
("coreutils" ,%bootstrap-coreutils)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
@@ -676,7 +676,7 @@
("coreutils" ,%bootstrap-coreutils)
("diffutils" ,diffutils-mesboot)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(supported-systems '("i686-linux"))
(arguments
`(#:implicit-inputs? #f
@@ -753,7 +753,7 @@
("coreutils" ,%bootstrap-coreutils)
("diffutils" ,diffutils-mesboot)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -876,7 +876,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
("coreutils" ,%bootstrap-coreutils)
("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -967,7 +967,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
("coreutils" ,%bootstrap-coreutils)
("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(outputs '("out"))
(arguments
`(#:implicit-inputs? #f
@@ -1063,7 +1063,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
("coreutils" ,%bootstrap-coreutils)
("diffutils" ,diffutils-mesboot)
("kernel-headers" ,%bootstrap-linux-libre-headers)
- ("make" ,make-mesboot)))
+ ("make" ,make-mesboot0)))
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
@@ -1127,6 +1127,42 @@ ac_cv_c_float_format='IEEE (little-endian)'
"--with-sysroot=/"
(string-append "--prefix=" out
+(define-public make-mesboot
+ (package-with-bootstrap-guile
+ (package
+ (inherit make-mesboot0)
+ (name "make-mesboot")
+ (supported-systems '("i686-linux"))
+ (inputs '())
+ (propagated-inputs '())
+ (native-inputs `(("binutils" ,binutils-mesboot0)
+ ("libc" ,glibc-mesboot)
+ ("gcc" ,gcc-mesboot0)
+ ("make" ,make-mesboot0)
+
+ ("bash" ,%bootstrap-coreutils)
+ ("coreutils" ,%bootstrap-coreutils)
+ ("kernel-headers" ,%bootstrap-linux-libre-headers)))
+ (arguments
+ `(#:implicit-inputs? #f
+#:parallel-build? #f
+#:tests? #f ; check depends on perl
+#:guile ,%bootstrap-guile
+#:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries
+;;#:configure-flags '("LIBS=-lc -lnss_files -lnss_dns -lresolv")
+#:phases
+(modify
