diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-25 22:24:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-26 13:24:28 +0200 |
| commit | 114a9f1f803b53bd295c44b3719c1ed5dd288e40 (patch) | |
| tree | 3ad5fc3131b8031265e8678faa46bd0ff55837d2 /gnu/packages/make-bootstrap.scm | |
| parent | 0b9da8b5a2dd9bcb2800d60751eb462e3000fa73 (diff) | |
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.
Diffstat (limited to 'gnu/packages/make-bootstrap.scm')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 32542f6da78..9f4f5bb4af5 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm | |||
| @@ -585,11 +585,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 585 | (define %mescc-tools-static | 585 | (define %mescc-tools-static |
| 586 | ;; A statically linked MesCC Tools. | 586 | ;; A statically linked MesCC Tools. |
| 587 | (package | 587 | (package |
| 588 | (inherit mescc-tools-0.5.2) | 588 | (inherit mescc-tools) |
| 589 | (name "mescc-tools-static") | 589 | (name "mescc-tools-static") |
| 590 | (arguments | 590 | (arguments |
| 591 | `(#:system "i686-linux" | 591 | `(#:system "i686-linux" |
| 592 | ,@(substitute-keyword-arguments (package-arguments mescc-tools-0.5.2) | 592 | ,@(substitute-keyword-arguments (package-arguments mescc-tools) |
| 593 | ((#:make-flags flags) | 593 | ((#:make-flags flags) |
| 594 | `(cons "CC=gcc -static" ,flags))))))) | 594 | `(cons "CC=gcc -static" ,flags))))))) |
| 595 | 595 | ||
| @@ -624,7 +624,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 624 | (define-public %mes-minimal | 624 | (define-public %mes-minimal |
| 625 | ;; A minimal Mes without documentation. | 625 | ;; A minimal Mes without documentation. |
| 626 | (package | 626 | (package |
| 627 | (inherit mes-0.19) | 627 | (inherit mes) |
| 628 | (name "mes-minimal") | 628 | (name "mes-minimal") |
| 629 | (native-inputs | 629 | (native-inputs |
| 630 | `(("guile" ,guile-2.2))) | 630 | `(("guile" ,guile-2.2))) |
| @@ -641,7 +641,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 641 | (share (string-append out "/share"))) | 641 | (share (string-append out "/share"))) |
| 642 | (delete-file-recursively (string-append out "/lib/guile")) | 642 | (delete-file-recursively (string-append out "/lib/guile")) |
| 643 | (delete-file-recursively (string-append share "/guile")) | 643 | (delete-file-recursively (string-append share "/guile")) |
| 644 | (delete-file-recursively (string-append share "/mes/scaffold")) | ||
| 645 | 644 | ||
| 646 | (for-each delete-file | 645 | (for-each delete-file |
| 647 | (find-files | 646 | (find-files |
