[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/57: build-system: zig: Add shrink-runpath phase.
From: |
guix-commits |
Subject: |
04/57: build-system: zig: Add shrink-runpath phase. |
Date: |
Wed, 13 Nov 2024 11:46:49 -0500 (EST) |
hako pushed a commit to branch wip-zig-bootstrap
in repository guix.
commit 39eaa776cdb773ad07fddd4aecfac7acc7b6ddb7
Author: Hilton Chain <hako@ultrarare.space>
AuthorDate: Tue Nov 12 19:26:57 2024 +0800
build-system: zig: Add shrink-runpath phase.
* guix/build/zig-build-system.scm (%standard-phases): Add shrink-runpath
from
meson-build-system.
* guix/build-system/zig.scm (%zig-build-system-modules): Add modules from
%meson-build-system-modules.
* gnu/packages/zig-xyz.scm (tigerbeetle,zig-zls)[arguments]: Delete
shrink-runpath phase.
Change-Id: I9b918fbf4b96b443c98c9f1527157f6c2ef8cd9b
---
gnu/packages/zig-xyz.scm | 12 ++++++++++--
guix/build-system/zig.scm | 2 ++
guix/build/zig-build-system.scm | 5 ++++-
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 0cd08b6ac6..a43d8dc1f6 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -98,7 +98,11 @@ directly from a tty using KMS/DRM.")
(arguments
(list
#:zig zig-0.9
- #:zig-release-type "safe"))
+ #:zig-release-type "safe"
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Statically linked.
+ (delete 'shrink-runpath))))
(synopsis "Distributed financial accounting database")
(description "TigerBeetle is a financial accounting database designed for
mission-critical safety and performance for financial services.")
@@ -123,7 +127,11 @@ mission-critical safety and performance for financial
services.")
(inputs (list zig-0.10 python))
(arguments
;; The tests fail with memory leaks.
- (list #:tests? #f))
+ (list #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Statically linked.
+ (delete 'shrink-runpath))))
(synopsis "Zig language server")
(description
"Zig Language Server is a language server implementing the @acronym{LSP,
diff --git a/guix/build-system/zig.scm b/guix/build-system/zig.scm
index ad8a96b607..f0557a6197 100644
--- a/guix/build-system/zig.scm
+++ b/guix/build-system/zig.scm
@@ -25,6 +25,7 @@
#:use-module (guix packages)
#:use-module (guix build-system)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (ice-9 match)
#:use-module (srfi srfi-26)
#:export (zig-build-system))
@@ -39,6 +40,7 @@
(define %zig-build-system-modules
;; Build-side modules imported by default.
`((guix build zig-build-system)
+ ,@%meson-build-system-modules
,@%default-gnu-imported-modules))
(define* (zig-build name inputs
diff --git a/guix/build/zig-build-system.scm b/guix/build/zig-build-system.scm
index 8352a73324..158a22fce8 100644
--- a/guix/build/zig-build-system.scm
+++ b/guix/build/zig-build-system.scm
@@ -18,6 +18,7 @@
(define-module (guix build zig-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
+ #:use-module ((guix build meson-build-system) #:prefix meson:)
#:use-module (guix build utils)
#:use-module (ice-9 popen)
#:use-module (ice-9 rdelim)
@@ -96,7 +97,9 @@
(add-before 'build 'set-cc set-cc)
(replace 'build build)
(replace 'check check)
- (replace 'install install)))
+ (replace 'install install)
+ (add-after 'strip 'shrink-runpath
+ (assoc-ref meson:%standard-phases 'shrink-runpath))))
(define* (zig-build #:key inputs (phases %standard-phases)
- 13/57: gnu: Add zig-0.10.0-961., (continued)
- 13/57: gnu: Add zig-0.10.0-961., guix-commits, 2024/11/13
- 18/57: gnu: Add zig-0.10.0-1506., guix-commits, 2024/11/13
- 02/57: gnu: zig-0.9: Update patch., guix-commits, 2024/11/13
- 01/57: gnu: zig: Add 'zig-source' procedure., guix-commits, 2024/11/13
- 21/57: gnu: Add zig-0.10.0-1681., guix-commits, 2024/11/13
- 34/57: gnu: Add zig-0.10.0-3807., guix-commits, 2024/11/13
- 32/57: gnu: Add zig-0.10.0-3726., guix-commits, 2024/11/13
- 45/57: gnu: Add zig-0.11.0-702., guix-commits, 2024/11/13
- 42/57: gnu: Add zig-0.11.0-587., guix-commits, 2024/11/13
- 53/57: gnu: Add zig-0.11.0-3604., guix-commits, 2024/11/13
- 04/57: build-system: zig: Add shrink-runpath phase.,
guix-commits <=
- 11/57: gnu: Add zig-0.10.0-851., guix-commits, 2024/11/13
- 03/57: gnu: zig-0.10: Workaround RUNPATH issue., guix-commits, 2024/11/13
- 23/57: gnu: Add zig-0.10.0-1713., guix-commits, 2024/11/13
- 36/57: gnu: Add zig-0.10.0-3980., guix-commits, 2024/11/13
- 30/57: gnu: Add zig-0.10.0-2838., guix-commits, 2024/11/13
- 29/57: gnu: Add zig-0.10.0-2797., guix-commits, 2024/11/13
- 07/57: gnu: Add zig-0.10.0-675., guix-commits, 2024/11/13
- 47/57: gnu: Add zig-0.11.0-1967., guix-commits, 2024/11/13
- 51/57: gnu: Add zig-0.11.0-3503., guix-commits, 2024/11/13
- 46/57: gnu: Add zig-0.11.0-761., guix-commits, 2024/11/13