diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2022-05-14 21:39:06 +0200 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2022-05-14 21:39:06 +0200 |
| commit | 89a8bd925774911f225713de6bf2e4c94319b640 (patch) | |
| tree | e059a786a527b341ad6fd28d99da60ed4543c2cf | |
| parent | f99f4a2257ceaf3b555e284d241d897da43b2868 (diff) | |
gnu: commencement: mes-boot: Use new package style.wip-full-source-bootstrap
* gnu/packages/commencement.scm (mes-boot)[arguments]: Use gexp for modify
phases.
| -rw-r--r-- | gnu/packages/commencement.scm | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 0089c2607c5..268dfe9795e 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm | |||
| @@ -445,55 +445,55 @@ MesCC-Tools), and finally M2-Planet.") | |||
| 445 | (snippet #f)))) | 445 | (snippet #f)))) |
| 446 | ,@(%boot-gash-inputs))) | 446 | ,@(%boot-gash-inputs))) |
| 447 | (arguments | 447 | (arguments |
| 448 | `(#:implicit-inputs? #f | 448 | (list |
| 449 | #:tests? #f | 449 | #:implicit-inputs? #f |
| 450 | #:guile ,%bootstrap-guile | 450 | #:tests? #f |
| 451 | #:strip-binaries? #f ;no strip yet | 451 | #:guile %bootstrap-guile |
| 452 | #:phases | 452 | #:strip-binaries? #f ;no strip yet |
| 453 | (modify-phases %standard-phases | 453 | #:phases |
| 454 | (add-after 'unpack 'unpack-seeds | 454 | #~(modify-phases %standard-phases |
| 455 | (lambda _ | 455 | (add-after 'unpack 'unpack-seeds |
| 456 | (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source"))) | 456 | (lambda _ |
| 457 | (with-directory-excursion ".." | 457 | (let ((nyacc-source #$(this-package-native-input "nyacc-source"))) |
| 458 | (invoke "tar" "-xvf" nyacc-source))))) | 458 | (with-directory-excursion ".." |
| 459 | (replace 'configure | 459 | (invoke "tar" "-xvf" nyacc-source))))) |
| 460 | (lambda* (#:key inputs outputs #:allow-other-keys) | 460 | (replace 'configure |
| 461 | (let ((out (assoc-ref outputs "out")) | 461 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 462 | (gash (assoc-ref inputs "bash")) | 462 | (let ((out #$output) |
| 463 | (mes (assoc-ref inputs "mes")) | 463 | (gash #$(this-package-native-input "bash")) |
| 464 | (dir (with-directory-excursion ".." (getcwd)))) | 464 | (dir (with-directory-excursion ".." (getcwd)))) |
| 465 | (setenv "GUILE_LOAD_PATH" (string-append | 465 | (setenv "GUILE_LOAD_PATH" (string-append |
| 466 | dir "/nyacc-1.00.2/module")) | 466 | dir "/nyacc-1.00.2/module")) |
| 467 | (invoke "gash" "configure.sh" | 467 | (invoke "gash" "configure.sh" |
| 468 | (string-append "--prefix=" out) | 468 | (string-append "--prefix=" out) |
| 469 | "--host=i686-linux-gnu")))) | 469 | "--host=i686-linux-gnu")))) |
| 470 | (replace 'build | 470 | (replace 'build |
| 471 | (lambda _ | 471 | (lambda _ |
| 472 | (invoke "gash" "bootstrap.sh"))) | 472 | (invoke "gash" "bootstrap.sh"))) |
| 473 | (delete 'check) | 473 | (delete 'check) |
| 474 | (replace 'install | 474 | (replace 'install |
| 475 | (lambda* (#:key outputs #:allow-other-keys) | 475 | (lambda* (#:key outputs #:allow-other-keys) |
| 476 | (substitute* "install.sh" ; show some progress | 476 | (substitute* "install.sh" ; show some progress |
| 477 | ((" -xf") " -xvf") | 477 | ((" -xf") " -xvf") |
| 478 | (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd) | 478 | (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd) |
| 479 | (string-append space "echo '" cmd "'\n" | 479 | (string-append space "echo '" cmd "'\n" |
| 480 | space cmd "\n"))) | 480 | space cmd "\n"))) |
| 481 | (invoke "gash" "install.sh") | 481 | (invoke "gash" "install.sh") |
| 482 | ;; Keep ASCII output, for friendlier comparison and bisection | 482 | ;; Keep ASCII output, for friendlier comparison and bisection |
| 483 | (let* ((out (assoc-ref outputs "out")) | 483 | (let* ((out #$output) |
| 484 | (cache (string-append out "/lib/cache"))) | 484 | (cache (string-append out "/lib/cache"))) |
| 485 | (define (objects-in-dir dir) | 485 | (define (objects-in-dir dir) |
| 486 | (find-files dir | 486 | (find-files dir |
| 487 | (lambda (name stat) | 487 | (lambda (name stat) |
| 488 | (and (equal? (dirname name) dir) | 488 | (and (equal? (dirname name) dir) |
| 489 | (or (string-suffix? ".M1" name) | 489 | (or (string-suffix? ".M1" name) |
| 490 | (string-suffix? ".hex2" name) | 490 | (string-suffix? ".hex2" name) |
| 491 | (string-suffix? ".o" name) | 491 | (string-suffix? ".o" name) |
| 492 | (string-suffix? ".s" name)))))) | 492 | (string-suffix? ".s" name)))))) |
| 493 | (for-each (lambda (x) (install-file x cache)) | 493 | (for-each (lambda (x) (install-file x cache)) |
| 494 | (append (objects-in-dir "m2") | 494 | (append (objects-in-dir "m2") |
| 495 | (objects-in-dir ".") | 495 | (objects-in-dir ".") |
| 496 | (objects-in-dir "mescc-lib"))))))))) | 496 | (objects-in-dir "mescc-lib"))))))))) |
| 497 | (native-search-paths | 497 | (native-search-paths |
| 498 | (list (search-path-specification | 498 | (list (search-path-specification |
| 499 | (variable "C_INCLUDE_PATH") | 499 | (variable "C_INCLUDE_PATH") |
