janneke pushed a commit to branch wip-bootstrap in repository guix. commit 0765a3a443ef3cb3bb2515f53f44a5cf2745f687 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sun Dec 3 15:58:11 2017 +0100
gnu: Update mescc-tools-boot, mes-boot, tcc-boot. * gnu/packages/mes.scm (%mescc-tools-seed): Update for new Mes libc layout. (%mes-seed): Likewise. (%tinycc-seed): Likewise. (mescc-tools-boot): Likewise. (mes-boot): Likewise. (tcc-boot): Likewise. --- gnu/packages/mes.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 4fa35cd..201d0d9 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -44,33 +44,33 @@ (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" "/repository/archive.tar.gz?ref=" - "09f390010785c975e18bba6ef00b16ac4ba28327")) + "dfea9989357b6f207cf3ec9bed8d4b3a8aaee69a")) (file-name (string-append "mescc-tools-seed" "-" "0.3" ".tar.xz")) (sha256 (base32 - "0g63cqxn8c65dhqar96xjqmzfzkszwsayb2acjl445592zz7wv3f")))) + "13d8ig24k4c1mb9p6y43xg7c3syw4spvgpra0nxvkbwgv2izk4is")))) (define %mes-seed (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/mes-seed" "/repository/archive.tar.gz?ref=" - "1cb607a8d8318a1b3492a419df0f52c24f1b3233")) + "174ab7fe75cc78f5969edb64756722b54333bf04")) (file-name (string-append "mes-seed-0.11" ".tar.xz")) (sha256 (base32 - "1a1yhmvyyynvmx9q7s97jfpb6k2yh2gjyzq4cd3xwzmvah3jv6b5")))) + "0vxa5k2s76izamih1686399b4dwhrx8zj5insl1macxgif2jam2l")))) (define %tinycc-seed (origin (method url-fetch) (uri (string-append "https://gitlab.com/janneke/tinycc-seed" "/repository/archive.tar.gz?ref=" - "8c6048e4face831acff54dc9b97f5053f07b2160")) + "a497ff60a2936af7dc17e994378ce43d248c0692")) (file-name (string-append "tinycc-seed" "-" "0.9.26" ".tar.xz")) (sha256 (base32 - "0p36gb61mai9a8khh9hbjjzwqp3bmkdi57qccg1w0wmr7vvidnf7")))) + "16ywgiracw72zixdr6zx1nmb2clja31011pq445xas2wkjs2ab5w")))) (define %srfi-43 (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 "bd860fc132fc047f0c3554a50171d2477ae7b8e7")) + (commit "3102e7ca44ab12e2eb8567763c681123e79a3c35")) (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 - "1jc1n383s35pqkjcyhaa4xqgxynfc7lj40zzik7vc537xrxgll05")))) + "1kqs8z43c286hqyiwk6vs5rywhjzrys84fzh535vwpv4qky61yy4")))) (native-inputs `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash")) ("bash" ,(search-bootstrap-binary "bash" (%current-system))) @@ -228,7 +228,7 @@ hex2 linker.") (define-public mes-boot (let ((version "0.11") (revision "0") - (commit "dde712814b7ce076278f0ef161a2ff70a80116f1")) + (commit "0a6ac9a4be038d37de726be4fe2d4692d17243d6")) (package-with-bootstrap-guile (package (name "mes-boot") @@ -242,7 +242,7 @@ hex2 linker.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0ncq3zw3qcdrjgr08qkgrm24azrx1yck3200spj0j9jigl8l4yc5")))) + "05fnhc4cvsbanwxbjvadrgy7vn1qanbl1159rz34v6b92gva1bld")))) (build-system trivial-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs @@ -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 "1e7584177f07a605c708f1b560b24e21d2736a2a")) + (commit "b034ea761756184ef99b0c461542f0cc6793d09f")) (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 - "1mi0616zkxjs31bc324ja7n3128gcb3l9ank8g5p62zyp8xnc0wh")))) + "1b71ag205d8zja7haa06ypdy6k8vq9092n7hxv7c6pkwl3w18dk7")))) (build-system trivial-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs @@ -407,6 +407,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (chdir "source") (setenv "PREFIX" out) (setenv "MESCC" (string-append mes "/bin/mescc.scm")) + (setenv "OBJDUMP" "true") (setenv "GUILE_AUTO_COMPILE" "1") (setenv "GUILE_LOAD_COMPILED_PATH" (string-append guile "/lib/guile/2.0/ccache")) @@ -427,6 +428,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (zero? (system* "sh" "build.sh")) ;; check: 26/65 tests fail + (zero? (system* "sh" "-ex" "test.sh" "01-return-0")) (or (zero? (system* "sh" "check.sh")) #t) ;; install