From 2382bb87c5e25b193e4afc5182b77f12c9a163c7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 22 May 2022 08:30:46 +0200 Subject: gnu: commencement: tcc-boot0: Use new package style. * gnu/packages/commencement.scm (tcc-boot0)[arguments]: Use gexp for modify phases. --- gnu/packages/commencement.scm | 105 +++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 52 deletions(-) (limited to 'gnu/packages/commencement.scm') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d833182391..29e081b6d8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -543,59 +543,60 @@ (define tcc-boot0 (snippet #f)))) ,@(%boot-gash-inputs))) (arguments - `(#:implicit-inputs? #f - #:guile ,%bootstrap-guile - #:validate-runpath? #f ; no dynamic executables - #:strip-binaries? #f ; no strip yet - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-seeds - (lambda* (#:key outputs #:allow-other-keys) - (let ((nyacc-source (assoc-ref %build-inputs "nyacc-source"))) - (with-directory-excursion ".." - (invoke "tar" "-xvf" nyacc-source))))) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (dir (with-directory-excursion ".." (getcwd))) - (interpreter "/lib/mes-loader") - (mes (assoc-ref inputs "mes")) - (mescc (string-append mes "/bin/mescc"))) - (substitute* "conftest.c" - (("volatile") "")) - (setenv "prefix" out) - (setenv "GUILE_LOAD_PATH" - (string-append dir "/nyacc-1.00.2/module")) - (invoke "sh" "configure" - "--cc=mescc" - (string-append "--prefix=" out) - (string-append "--elfinterp=" interpreter) - "--crtprefix=." - "--tccdir=.")))) - (replace 'build - (lambda _ - (substitute* "bootstrap.sh" ; Show some progress - (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{program_prefix[}]tcc) [^\"]*[^\\])\n" all space cmd) - (string-append space "echo \"" cmd "\"\n" - space cmd "\n"))) - (invoke "sh" "bootstrap.sh"))) - (replace 'check - (lambda _ - ;; fail fast tests - (system* "./tcc" "--help") ; --help exits 1 - ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") - ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") - ;; TODO: add sensible check target (without depending on make) - ;; (invoke "sh" "check.sh") - #t)) - (replace 'install - (lambda _ - (substitute* "install.sh" ; Show some progress - (("^( *)((cp|ls|mkdir|rm|tar|./[$][{PROGRAM_PREFIX[}]tcc) [^\"]*[^\\])\n" all space cmd) - (string-append space "echo \"" cmd "\"\n" - space cmd "\n"))) + (list + #:implicit-inputs? #f + #:guile %bootstrap-guile + #:validate-runpath? #f ; no dynamic executables + #:strip-binaries? #f ; no strip yet + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-extra-sources + (lambda* (#:key outputs #:allow-other-keys) + (let ((nyacc-source #$(this-package-native-input "nyacc-source"))) + (with-directory-excursion ".." + (invoke "tar" "-xvf" nyacc-source))))) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out #$output) + (dir (with-directory-excursion ".." (getcwd))) + (interpreter "/lib/mes-loader") + (mes #$(this-package-native-input "mes")) + (mescc (string-append mes "/bin/mescc"))) + (substitute* "conftest.c" + (("volatile") "")) + (setenv "prefix" out) + (setenv "GUILE_LOAD_PATH" + (string-append dir "/nyacc-1.00.2/module")) + (invoke "sh" "configure" + "--cc=mescc" + (string-append "--prefix=" out) + (string-append "--elfinterp=" interpreter) + "--crtprefix=." + "--tccdir=.")))) + (replace 'build + (lambda _ + (substitute* "bootstrap.sh" ; Show some progress + (("^( *)((cp|ls|mkdir|rm|[.]/tcc|[.]/[$][{program_prefix[}]tcc) [^\"]*[^\\])\n" all space cmd) + (string-append space "echo \"" cmd "\"\n" + space cmd "\n"))) + (invoke "sh" "bootstrap.sh"))) + (replace 'check + (lambda _ + ;; fail fast tests + (system* "./tcc" "--help") ; --help exits 1 + ;; (invoke "sh" "test.sh" "mes/scaffold/tests/30-strlen") + ;; (invoke "sh" "-x" "test.sh" "mes/scaffold/tinycc/00_assignment") + ;; TODO: add sensible check target (without depending on make) + ;; (invoke "sh" "check.sh") + )) + (replace 'install + (lambda _ + (substitute* "install.sh" ; Show some progress + (("^( *)((cp|ls|mkdir|rm|tar|./[$][{PROGRAM_PREFIX[}]tcc) [^\"]*[^\\])\n" all space cmd) + (string-append space "echo \"" cmd "\"\n" + space cmd "\n"))) - (invoke "sh" "install.sh")))))) + (invoke "sh" "install.sh")))))) (native-search-paths (list (search-path-specification (variable "C_INCLUDE_PATH") -- cgit v1.2.3 +0100'>2023-02-28gnu: sugar-toolkit-gtk3: Add bash-minimal to inputs.Ricardo Wurmus 2023-02-28gnu: sugar-datastore: Add bash-minimal to inputs.Ricardo Wurmus 2023-02-28gnu: sugar: Add bash-minimal to inputs.Ricardo Wurmus 2023-02-28gnu: Add sugar-browse-activity.Ricardo Wurmus 2023-02-28gnu: sugar-help-activity: Build English HTML.Ricardo Wurmus 2023-02-28gnu: sugar-toolkit-gtk3: Include output directory in GI_TYPELIB_PATH.Ricardo Wurmus 2023-02-28gnu: sugar-typing-turtle-activity: Add setxkbmap to inputs.Ricardo Wurmus 2023-02-27gnu: sugar-toolkit-gtk3: Propagate missing inputs.Ricardo Wurmus 2023-02-27gnu: Add sugar-typing-turtle-activity.Ricardo Wurmus 2023-02-27gnu: Add sugar-help-activity.Ricardo Wurmus 2023-02-27gnu: sugar: Add missing inputs.Ricardo Wurmus 2023-02-27gnu: sugar: Propagate sugar packages.Ricardo Wurmus 2023-02-27gnu: sugar: Patch brightness module.Ricardo Wurmus 2023-02-27gnu: sugar-toolkit-gtk3: Add missing inputs.Ricardo Wurmus 2023-02-27gnu: sugar: Patch global location of Sugar activities.Ricardo Wurmus 2023-02-14gnu: sugar: Add metacity to inputs.Ricardo Wurmus 2023-01-04gnu: Add sugar.Ricardo Wurmus 2023-01-04gnu: sugar-toolkit-gtk3: Add missing inputs.Ricardo Wurmus 2023-01-04gnu: Add sugar-artwork.Ricardo Wurmus 2023-01-04gnu: Add sugar-datastore.Ricardo Wurmus 2023-01-04gnu: sugar-toolkit-gtk3: Propagate some inputs.Ricardo Wurmus 2023-01-04gnu: Add sugar-toolkit-gtk3.Ricardo Wurmus