mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: zig: Build reproducibly.
* guix/build/zig-utils.scm: New file. * Makefile.am (MODULES): Add it. * guix/build-system/zig.scm (%zig-build-system-modules): Add it. (zig-build,zig-cross-build): Add #:zig-build-target. * guix/build/zig-build-system.scm (zig-target): Move to (guix build zig-utils). (configure): Move to (guix build zig-utils) as zig-configure. (build): Replace target with zig-build-target. (%standard-phases): Adjust accordingly. * gnu/packages/zig.scm (zig-0.9)[arguments]<#:imported-modules,#:modules>: Add zig-build-system modules. <#:configure-flags>: Set ZIG_TARGET_TRIPLE for native builds too. Move applicable flags from zig-0.10 here. <#:phases>: Apply 'zig-configure. Unset ZIG_LIBC in 'check. Remove 'set-cache-dir. (zig-0.10)[arguments]<#:configure-flags>: Adjust accordingly. (zig-0.10.0-610)[arguments]<#:configure-flags>: Remove ZIG_TARGET_TRIPLE.
This commit is contained in:
Hilton Chain
parent
05bbf0ec43
commit
3ef8c9307c
5 changed files with 124 additions and 66 deletions
|
|
@ -20,6 +20,7 @@
|
|||
(define-module (guix build zig-build-system)
|
||||
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
|
||||
#:use-module (guix build utils)
|
||||
#:use-module (guix build zig-utils)
|
||||
#:use-module (ice-9 popen)
|
||||
#:use-module (ice-9 rdelim)
|
||||
#:use-module (ice-9 ftw)
|
||||
|
|
@ -33,55 +34,12 @@
|
|||
|
||||
;; Interesting guide here:
|
||||
;; https://github.com/riverwm/river/blob/master/PACKAGING.md
|
||||
(define global-cache-dir "zig-cache")
|
||||
|
||||
(define* (configure #:key inputs target #:allow-other-keys)
|
||||
;; Set cache dir, otherwise Zig looks for `$HOME/.cache'.
|
||||
(setenv "ZIG_GLOBAL_CACHE_DIR" global-cache-dir)
|
||||
|
||||
(setenv "PKG_CONFIG"
|
||||
(if target
|
||||
(string-append target "-pkg-config")
|
||||
"pkg-config"))
|
||||
|
||||
;; Libc paths for target.
|
||||
(let ((libc (assoc-ref inputs (if target "cross-libc" "libc")))
|
||||
(port (open-file "/tmp/guix-zig-libc-paths" "w" #:encoding "utf8")))
|
||||
(display
|
||||
(string-append "\
|
||||
include_dir=" libc "/include
|
||||
sys_include_dir=" libc "/include
|
||||
crt_dir=" libc "/lib
|
||||
msvc_lib_dir=
|
||||
kernel32_lib_dir=
|
||||
gcc_dir=")
|
||||
port)
|
||||
(close-port port))
|
||||
(setenv "ZIG_LIBC" "/tmp/guix-zig-libc-paths"))
|
||||
|
||||
(define (zig-target target)
|
||||
(cond
|
||||
((string=? target "i586-pc-gnu")
|
||||
"x86-hurd-gnu")
|
||||
((string=? target "i686-linux-gnu")
|
||||
"x86-linux-gnu")
|
||||
((string=? target "i686-w64-mingw32")
|
||||
"x86-windows-gnu")
|
||||
((string=? target "mips64el-linux-gnu")
|
||||
"mips64el-linux-gnuabi64")
|
||||
((string=? target "powerpc-linux-gnu")
|
||||
"powerpc-linux-gnueabi")
|
||||
((string=? target "x86_64-pc-gnu")
|
||||
"x86_64-hurd-gnu")
|
||||
((string=? target "x86_64-w64-mingw32")
|
||||
"x86_64-windows-gnu")
|
||||
(else target)))
|
||||
|
||||
(define* (build #:key
|
||||
zig-build-flags
|
||||
zig-build-target
|
||||
zig-release-type ;; "safe", "fast" or "small" empty for a
|
||||
;; debug build"
|
||||
target
|
||||
#:allow-other-keys)
|
||||
"Build a given Zig package."
|
||||
|
||||
|
|
@ -91,9 +49,7 @@ gcc_dir=")
|
|||
"--prefix-lib-dir" "lib"
|
||||
"--prefix-exe-dir" "bin"
|
||||
"--prefix-include-dir" "include"
|
||||
,@(if target
|
||||
(list (string-append "-Dtarget=" (zig-target target)))
|
||||
'())
|
||||
,(string-append "-Dtarget=" (zig-target zig-build-target))
|
||||
,@(if zig-release-type
|
||||
(list (string-append "-Drelease-" zig-release-type))
|
||||
'())
|
||||
|
|
@ -125,7 +81,7 @@ gcc_dir=")
|
|||
(define %standard-phases
|
||||
(modify-phases gnu:%standard-phases
|
||||
(delete 'bootstrap)
|
||||
(replace 'configure configure)
|
||||
(replace 'configure zig-configure)
|
||||
(replace 'build build)
|
||||
(replace 'check check)
|
||||
(replace 'install install)))
|
||||
|
|
|
|||
79
guix/build/zig-utils.scm
Normal file
79
guix/build/zig-utils.scm
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2024 Hilton Chain <hako@ultrarare.space>
|
||||
;;; Copyright © 2024 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
||||
;;; under the terms of the GNU General Public License as published by
|
||||
;;; the Free Software Foundation; either version 3 of the License, or (at
|
||||
;;; your option) any later version.
|
||||
;;;
|
||||
;;; GNU Guix is distributed in the hope that it will be useful, but
|
||||
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
;;; GNU General Public License for more details.
|
||||
;;;
|
||||
;;; You should have received a copy of the GNU General Public License
|
||||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (guix build zig-utils)
|
||||
#:use-module (guix build utils)
|
||||
#:export (zig-configure
|
||||
zig-target))
|
||||
|
||||
;;;
|
||||
;;; Common procedures for zig and zig-build-system.
|
||||
;;;
|
||||
|
||||
(define* (zig-configure #:key inputs target #:allow-other-keys)
|
||||
;; Set cache dir, otherwise Zig looks for `$HOME/.cache'.
|
||||
(setenv "ZIG_GLOBAL_CACHE_DIR" "/tmp/zig-cache")
|
||||
(setenv "ZIG_LOCAL_CACHE_DIR" "/tmp/zig-cache")
|
||||
|
||||
;; XXX: Required for unpatched intermediade versions?
|
||||
;; Set CC, since the stage 2 zig relies on it to find the libc
|
||||
;; installation, and otherwise silently links against its own.
|
||||
(setenv "CC"
|
||||
(if target
|
||||
(string-append target "-gcc")
|
||||
"gcc"))
|
||||
|
||||
(setenv "PKG_CONFIG"
|
||||
(if target
|
||||
(string-append target "-pkg-config")
|
||||
"pkg-config"))
|
||||
|
||||
;; Libc paths for target.
|
||||
(let ((libc (assoc-ref inputs (if target "cross-libc" "libc")))
|
||||
(port (open-file "/tmp/guix-zig-libc-paths" "w" #:encoding "utf8")))
|
||||
(when libc
|
||||
(display
|
||||
(string-append "\
|
||||
include_dir=" libc "/include
|
||||
sys_include_dir=" libc "/include
|
||||
crt_dir=" libc "/lib
|
||||
msvc_lib_dir=
|
||||
kernel32_lib_dir=
|
||||
gcc_dir=")
|
||||
port)
|
||||
(setenv "ZIG_LIBC" "/tmp/guix-zig-libc-paths"))
|
||||
(close-port port)))
|
||||
|
||||
(define (zig-target target)
|
||||
(cond
|
||||
((string=? target "i586-pc-gnu")
|
||||
"x86-hurd-gnu")
|
||||
((string=? target "i686-linux-gnu")
|
||||
"x86-linux-gnu")
|
||||
((string=? target "i686-w64-mingw32")
|
||||
"x86-windows-gnu")
|
||||
((string=? target "mips64el-linux-gnu")
|
||||
"mips64el-linux-gnuabi64")
|
||||
((string=? target "powerpc-linux-gnu")
|
||||
"powerpc-linux-gnueabi")
|
||||
((string=? target "x86_64-pc-gnu")
|
||||
"x86_64-hurd-gnu")
|
||||
((string=? target "x86_64-w64-mingw32")
|
||||
"x86_64-windows-gnu")
|
||||
(else target)))
|
||||
Loading…
Add table
Add a link
Reference in a new issue