me
/
guix
Archived
1
0
Fork 0

gnu: mescc-tools: Update to 1.2.0.

Fixes <https://issues.guix.gnu.org/49515>.

* gnu/packages/mes.scm (mescc-tools-0.5.2): Remove.
(mescc-tools): Update to 1.2.0.  Use 'git-fetch'.
* gnu/packages/make-bootstrap.scm (%mescc-tools-static): Inherit from
MESCC-TOOLS rather than MESCC-TOOLS-0.5.2.
(%mes-minimal): Inherit from MES rather than MES-0.19.
[arguments]: Remove 'delete-file-recursively' for /mes/scaffold.
master
Ludovic Courtès 2021-07-25 22:24:21 +02:00
parent 0b9da8b5a2
commit 114a9f1f80
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 32 additions and 64 deletions

View File

@ -585,11 +585,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define %mescc-tools-static (define %mescc-tools-static
;; A statically linked MesCC Tools. ;; A statically linked MesCC Tools.
(package (package
(inherit mescc-tools-0.5.2) (inherit mescc-tools)
(name "mescc-tools-static") (name "mescc-tools-static")
(arguments (arguments
`(#:system "i686-linux" `(#:system "i686-linux"
,@(substitute-keyword-arguments (package-arguments mescc-tools-0.5.2) ,@(substitute-keyword-arguments (package-arguments mescc-tools)
((#:make-flags flags) ((#:make-flags flags)
`(cons "CC=gcc -static" ,flags))))))) `(cons "CC=gcc -static" ,flags)))))))
@ -624,7 +624,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define-public %mes-minimal (define-public %mes-minimal
;; A minimal Mes without documentation. ;; A minimal Mes without documentation.
(package (package
(inherit mes-0.19) (inherit mes)
(name "mes-minimal") (name "mes-minimal")
(native-inputs (native-inputs
`(("guile" ,guile-2.2))) `(("guile" ,guile-2.2)))
@ -641,7 +641,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(share (string-append out "/share"))) (share (string-append out "/share")))
(delete-file-recursively (string-append out "/lib/guile")) (delete-file-recursively (string-append out "/lib/guile"))
(delete-file-recursively (string-append share "/guile")) (delete-file-recursively (string-append share "/guile"))
(delete-file-recursively (string-append share "/mes/scaffold"))
(for-each delete-file (for-each delete-file
(find-files (find-files

View File

@ -164,7 +164,7 @@ parsers to allow execution with Guile as extension languages.")))
"15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"))
(propagated-inputs (list mescc-tools-0.5.2 nyacc-0.86)) (propagated-inputs (list mescc-tools nyacc-0.86))
(native-inputs (native-inputs
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
,@(let ((target-system (or (%current-target-system) ,@(let ((target-system (or (%current-target-system)
@ -295,30 +295,30 @@ Guile.")
(lambda _ (lambda _
(invoke "sh" "install.sh")))))))) (invoke "sh" "install.sh"))))))))
(define-public mescc-tools-0.5.2 (define-public mescc-tools
;; Mescc-tools used for bootstrap.
(let ((commit "bb062b0da7bf2724ca40f9002b121579898d4ef7")
(revision "0")
(version "0.5.2"))
(package (package
(name "mescc-tools") (name "mescc-tools")
(version (git-version version revision commit)) (version "1.2.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://git.savannah.nongnu.org/r/mescc-tools.git") (url "https://git.savannah.nongnu.org/r/mescc-tools.git")
(commit commit))) (commit (string-append "Release_" version))
(recursive? #t))) ;for M2libc
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1nc6rnax66vmhqsjg0kgx23pihdcxmww6v325ywf59vsq1jqjvff")))) "1xkn5sspfxldy4wm8fq8gd8kwn46578zhfl12c16pq74x21zb198"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("i686-linux" "x86_64-linux"
"armhf-linux" "aarch64-linux"
"powerpc64le-linux"))
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:test-target "test" #:test-target "test"
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(delete 'configure)))) (delete 'configure))))
(native-inputs (list which))
(synopsis "Tools for the full source bootstrapping process") (synopsis "Tools for the full source bootstrapping process")
(description (description
"Mescc-tools is a collection of tools for use in a full source "Mescc-tools is a collection of tools for use in a full source
@ -326,38 +326,7 @@ bootstrapping process. It consists of the M1 macro assembler, the hex2
linker, the blood-elf symbol table generator, the kaem shell, exec_enable and linker, the blood-elf symbol table generator, the kaem shell, exec_enable and
get_machine.") get_machine.")
(home-page "https://savannah.nongnu.org/projects/mescc-tools") (home-page "https://savannah.nongnu.org/projects/mescc-tools")
(license gpl3+)))) (license gpl3+)))
(define-public mescc-tools
(package
(inherit mescc-tools-0.5.2)
(name "mescc-tools")
(version "0.7.0")
(source
(origin
(method url-fetch)
(uri (string-append
"http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/"
name "-Release_" version
".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1p1ijia4rm3002f5sypidl9v5gq0mlch9b0n61rpxkdsaaxjqax3"))))
(supported-systems '("armhf-linux" "aarch64-linux"
"i686-linux" "x86_64-linux"))
(arguments
(substitute-keyword-arguments (package-arguments mescc-tools-0.5.2)
((#:make-flags _)
`(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc"))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-prefix
(lambda _
(substitute* "sha256.sh"
(("/usr/bin/sha256sum") (which "sha256sum")))
#t))))))))
(define-public m2-planet (define-public m2-planet
(package (package