[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/12: gnu: gn: Use G-expression.
From: |
guix-commits |
Subject: |
04/12: gnu: gn: Use G-expression. |
Date: |
Thu, 1 Dec 2022 18:25:09 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 6f0a8371feb7f349ec799bd31a547bd7e40d2f67
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Nov 28 04:39:59 2022 +0100
gnu: gn: Use G-expression.
* gnu/packages/build-tools.scm (gn)[arguments]: Convert to G-expression.
---
gnu/packages/build-tools.scm | 68 +++++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index a7a3ff2fa4..6c1350c44f 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -219,22 +219,24 @@ programs and other files depend.")
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'configure 'set-build-environment
- (lambda _
- (setenv "CC" "gcc") (setenv "CXX" "g++")
- (setenv "AR" "ar")))
- (replace 'configure
- (lambda _
- (invoke "python" "build/gen.py"
- "--no-last-commit-position")))
- (add-after 'configure 'create-last-commit-position
- (lambda _
- ;; Mimic GenerateLastCommitPosition from gen.py.
- (call-with-output-file "out/last_commit_position.h"
- (lambda (port)
- (format port
- "// Generated by Guix.
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'configure 'set-build-environment
+ (lambda _
+ (setenv "CC" "gcc")
+ (setenv "CXX" "g++")
+ (setenv "AR" "ar")))
+ (replace 'configure
+ (lambda _
+ (invoke "python" "build/gen.py"
+ "--no-last-commit-position")))
+ (add-after 'configure 'create-last-commit-position
+ (lambda _
+ ;; Mimic GenerateLastCommitPosition from gen.py.
+ (call-with-output-file "out/last_commit_position.h"
+ (lambda (port)
+ (format port
+ "// Generated by Guix.
#ifndef OUT_LAST_COMMIT_POSITION_H_
#define OUT_LAST_COMMIT_POSITION_H_
@@ -244,23 +246,23 @@ programs and other files depend.")
#endif // OUT_LAST_COMMIT_POSITION_H_
"
- ,revision ,revision ,(string-take commit
12))))))
- (replace 'build
- (lambda _
- (invoke "ninja" "-C" "out" "gn"
- "-j" (number->string (parallel-job-count)))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (if tests?
- (begin
- (invoke "ninja" "-C" "out" "gn_unittests"
- "-j" (number->string
(parallel-job-count)))
- (invoke "./out/gn_unittests"))
- (format #t "test suite not run~%"))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (install-file "out/gn" (string-append out
"/bin"))))))))
+ #$revision #$revision
+ #$(string-take commit 12))))))
+ (replace 'build
+ (lambda _
+ (invoke "ninja" "-C" "out" "gn"
+ "-j" (number->string (parallel-job-count)))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ (invoke "ninja" "-C" "out" "gn_unittests"
+ "-j" (number->string (parallel-job-count)))
+ (invoke "./out/gn_unittests"))
+ (format #t "test suite not run~%"))))
+ (replace 'install
+ (lambda _
+ (install-file "out/gn" (string-append #$output
"/bin")))))))
(native-inputs
(list ninja python-wrapper))
(synopsis "Generate Ninja build files")
- 07/12: gnu: svt-av1: Update to 1.3.0., (continued)
- 07/12: gnu: svt-av1: Update to 1.3.0., guix-commits, 2022/12/01
- 06/12: gnu: QtWebEngine: Simplify code to remove third-party files., guix-commits, 2022/12/01
- 01/12: gnu: balsa: Fix build., guix-commits, 2022/12/01
- 05/12: gnu: qtwebengine@6: Fix third-party code removal snippet., guix-commits, 2022/12/01
- 10/12: gnu: harfbuzz: Add 5.3.1., guix-commits, 2022/12/01
- 12/12: gnu: ungoogled-chromium: Update to 108.0.5359.71-1., guix-commits, 2022/12/01
- 08/12: gnu: balsa: Add release-monitoring-url., guix-commits, 2022/12/01
- 09/12: gnu: balsa: Update to 2.6.4., guix-commits, 2022/12/01
- 02/12: gnu: gn: Update to 0.0-2072.1c4151f., guix-commits, 2022/12/01
- 11/12: gnu: ungoogled-chromium: Generalize OpenJPEG substitution., guix-commits, 2022/12/01
- 04/12: gnu: gn: Use G-expression.,
guix-commits <=