From patchwork Wed Jun 21 15:06:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 51140 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 226F927BBE9; Wed, 21 Jun 2023 16:07:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B975727BBE2 for ; Wed, 21 Jun 2023 16:07:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBzQJ-0001m2-Ld; Wed, 21 Jun 2023 11:07:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBzQF-0001lh-3W for guix-patches@gnu.org; Wed, 21 Jun 2023 11:07:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBzQE-0002Zm-0Z for guix-patches@gnu.org; Wed, 21 Jun 2023 11:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBzQD-0006yP-RT for guix-patches@gnu.org; Wed, 21 Jun 2023 11:07:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60889] [PATCH v2] build-system: Add zig-build-system. References: <7NnZFxGvY0oj1TtDERAWi3dMBqoRv2AJoGBlaDPJA6vueGK91igAml6SLzMhNJyc1TssJW--OgezzmxLl5yv5MSgd7Wz6MRkORfOT62_f3w=@elenq.tech> In-Reply-To: <7NnZFxGvY0oj1TtDERAWi3dMBqoRv2AJoGBlaDPJA6vueGK91igAml6SLzMhNJyc1TssJW--OgezzmxLl5yv5MSgd7Wz6MRkORfOT62_f3w=@elenq.tech> Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Jun 2023 15:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 60889@debbugs.gnu.org Cc: Ekaitz Zarraga Received: via spool by 60889-submit@debbugs.gnu.org id=B60889.168736000526781 (code B ref 60889); Wed, 21 Jun 2023 15:07:01 +0000 Received: (at 60889) by debbugs.gnu.org; 21 Jun 2023 15:06:45 +0000 Received: from localhost ([127.0.0.1]:33949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBzPw-0006xs-CD for submit@debbugs.gnu.org; Wed, 21 Jun 2023 11:06:45 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:35122) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBzPt-0006xi-GH for 60889@debbugs.gnu.org; Wed, 21 Jun 2023 11:06:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=ndJ09Rm+iQ7oC00 DoZ/HopgkrPmYU2jHbja0OvgwozA=; h=date:subject:cc:to:from; d=lease-up.com; b=Jpj9jpniHQHVn8+gDHvzWZSxn0znDPEIkDriO5zfJyWudes5mzEU XCMM4EoOJMfz2lV8loReADnBbWjj2M+UomgOdVXL5viqYlemxYX1kvfc5LrH0QIorTxzT4 X3IAwhfePuW8z6w5MBsR3DemHpcipEwSCyv1alQvLy39uQJMM= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id c808f13d (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 21 Jun 2023 15:06:39 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id b8c30848; Wed, 21 Jun 2023 15:06:38 +0000 (UTC) Date: Wed, 21 Jun 2023 08:06:13 -0700 Message-Id: <9709080a22a38e340bdb709e0a0d8b305a1eb3a0.1687359946.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Ekaitz Zarraga * guix/build-system/zig.scm: New file. * guix/build/zig-build-system.scm: New file. * Makefile.am: Add them. * doc/guix.texi: Document it. * etc/snippets/yas/scheme-mode/guix-package (build-system): Add zig-build-system. --- Hi Ekaitz, Thanks for this important work! I rebased the build system below so it applies cleanly to master. I also moved tigerbeetle to the new Bug#64208 (together with the new Wayland compositor called River) and will declare this bug as a prerequisite for the other one. Kind regards Felix Makefile.am | 2 + doc/guix.texi | 20 ++++ etc/snippets/yas/scheme-mode/guix-package | 5 +- guix/build-system/zig.scm | 124 ++++++++++++++++++++++ guix/build/zig-build-system.scm | 100 +++++++++++++++++ 5 files changed, 249 insertions(+), 2 deletions(-) create mode 100644 guix/build-system/zig.scm create mode 100644 guix/build/zig-build-system.scm diff --git a/Makefile.am b/Makefile.am index a386e6033c..bbcccdf7bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -184,6 +184,7 @@ MODULES = \ guix/build-system/texlive.scm \ guix/build-system/tree-sitter.scm \ guix/build-system/trivial.scm \ + guix/build-system/zig.scm \ guix/ftp-client.scm \ guix/http-client.scm \ guix/gnupg.scm \ @@ -270,6 +271,7 @@ MODULES = \ guix/build/graft.scm \ guix/build/bournish.scm \ guix/build/qt-utils.scm \ + guix/build/zig-build-system.scm \ guix/build/make-bootstrap.scm \ guix/search-paths.scm \ guix/packages.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index c961f706ec..b302f883c4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9980,6 +9980,26 @@ Python package is used to run the script can be specified with the @code{#:python} parameter. @end defvar +@defvar zig-build-system +This variable is exported by @code{(guix build-system zig)}. It implements +the build procedures for the Zig build system (@code{zig build} command). + +Selecting this build system adds @code{zig} to the package inputs, in +addition to the packages of @code{gnu-build-system}. + +There is no @code{configure} phase because Zig packages typically do not +need to be configured. The @code{#:zig-build-flags} parameter is a list of +flags that are passed to the @code{zig} command during the build. The +@code{#:zig-test-flags} parameter is a list of flags that are passed to the +@code{zig test} command during the @code{check} phase. The default compiler +package can be overridden with the @code{#:zig} argument. + +The optional @code{zig-release-type} parameter declares the type of release. +Possible values are: @code{safe}, @code{fast}, or @code{small}. The default +value is @code{#f}, which causes the release flag to be omitted from the +@code{zig} command. That results in a @code{debug} build. +@end defvar + @defvar scons-build-system This variable is exported by @code{(guix build-system scons)}. It implements the build procedure used by the SCons software construction diff --git a/etc/snippets/yas/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package index 724a392f81..3bb6307659 100644 --- a/etc/snippets/yas/scheme-mode/guix-package +++ b/etc/snippets/yas/scheme-mode/guix-package @@ -43,8 +43,9 @@ "scons-build-system" "texlive-build-system" "trivial-build-system" - "waf-build-system")}) + "waf-build-system" + "zig-build-system")}) (home-page "$4") (synopsis "$5") (description "$6") - (license $7))) \ No newline at end of file + (license $7))) diff --git a/guix/build-system/zig.scm b/guix/build-system/zig.scm new file mode 100644 index 0000000000..16b8a712cc --- /dev/null +++ b/guix/build-system/zig.scm @@ -0,0 +1,124 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Ekaitz Zarraga +;;; +;;; 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 . + +(define-module (guix build-system zig) + #:use-module (guix search-paths) + #:use-module (guix store) + #:use-module (guix utils) + #:use-module (guix gexp) + #:use-module (guix monads) + #:use-module (guix packages) + #:use-module (guix build-system) + #:use-module (guix build-system gnu) + #:use-module (ice-9 match) + #:use-module (srfi srfi-26) + #:export (zig-build-system)) + + +(define (default-zig) + "Return the default zig package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((zig (resolve-interface '(gnu packages zig)))) + (module-ref zig 'zig))) + +(define %zig-build-system-modules + ;; Build-side modules imported by default. + `((guix build zig-build-system) + (guix build syscalls) + ,@%gnu-build-system-modules)) + +(define* (zig-build name inputs + #:key + source + (tests? #t) + (test-target #f) + (zig-build-flags ''()) + (zig-test-flags ''()) + (zig-release-type #f) + (phases '%standard-phases) + (outputs '("out")) + (search-paths '()) + (system (%current-system)) + (guile #f) + (imported-modules %zig-build-system-modules) + (modules '((guix build zig-build-system) + (guix build utils)))) + "Build SOURCE using Zig, and with INPUTS." + (define builder + (with-imported-modules imported-modules + #~(begin + (use-modules #$@(sexp->gexp modules)) + (zig-build #:name #$name + #:source #+source + #:system #$system + #:test-target #$test-target + #:zig-build-flags #$zig-build-flags + #:zig-test-flags #$zig-test-flags + #:zig-release-type #$zig-release-type + #:tests? #$tests? + #:phases #$phases + #:outputs #$(outputs->gexp outputs) + #:search-paths '#$(sexp->gexp + (map search-path-specification->sexp + search-paths)) + #:inputs #$(input-tuples->gexp inputs))))) + + (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) + system #:graft? #f))) + (gexp->derivation name builder + #:system system + #:guile-for-build guile))) + +(define* (lower name + #:key source inputs native-inputs outputs system target + (zig (default-zig)) + #:allow-other-keys + #:rest arguments) + "Return a bag for NAME." + + (define private-keywords + '(#:target #:zig #:inputs #:native-inputs #:outputs)) + + ;; TODO: support cross-compilation + ;; It's as simple as adding some build flags to `zig-build-flags` + ;; -Dtarget=aarch64-linux-musl, for example. + (and (not target) + (bag + (name name) + (system system) + (target target) + (host-inputs `(,@(if source + `(("source" ,source)) + '()) + ,@inputs + + ;; Keep the standard inputs of 'gnu-build-system' + ;; TODO: do we need this? + ,@(standard-packages))) + (build-inputs `(("zig" ,zig) + ,@native-inputs)) + (outputs outputs) + (build zig-build) + (arguments (strip-keyword-arguments private-keywords arguments))))) + +(define zig-build-system + (build-system + (name 'zig) + (description + "Zig build system, to build Zig packages") + (lower lower))) diff --git a/guix/build/zig-build-system.scm b/guix/build/zig-build-system.scm new file mode 100644 index 0000000000..d414ebfb17 --- /dev/null +++ b/guix/build/zig-build-system.scm @@ -0,0 +1,100 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Ekaitz Zarraga +;;; +;;; 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 . + +(define-module (guix build zig-build-system) + #:use-module ((guix build gnu-build-system) #:prefix gnu:) + #:use-module (guix build utils) + #:use-module (ice-9 popen) + #:use-module (ice-9 rdelim) + #:use-module (ice-9 ftw) + #:use-module (ice-9 format) + #:use-module (ice-9 match) + #:use-module (rnrs io ports) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) + #:export (%standard-phases + zig-build)) + +;; Interesting guide here: +;; https://github.com/riverwm/river/blob/master/PACKAGING.md +(define global-cache-dir "zig-cache") + +(define* (set-cc #:rest args) + ;; TODO: Zig needs the gcc-toolchain in order to find the libc. + ;; we need to think about how to solve this in the build system + ;; directly: --libc + (setenv "CC" "gcc")) + +(define* (set-zig-global-cache-dir #:rest args) + (setenv "ZIG_GLOBAL_CACHE_DIR" global-cache-dir)) + +(define* (build #:key + zig-build-flags + zig-release-type ;; "safe", "fast" or "small" empty for a + ;; debug build" + #:allow-other-keys) + "Build a given Zig package." + + (setenv "DESTDIR" "out") + (let ((call `("zig" "build" + "--prefix" "" ;; Don't add /usr + "--prefix-lib-dir" "lib" + "--prefix-exe-dir" "bin" + "--prefix-include-dir" "include" + ,@(if zig-release-type + (list (string-append "-Drelease-" zig-release-type)) + '()) + ,@zig-build-flags))) + (format #t "running: ~s~%" call) + (apply invoke call))) + +(define* (check #:key tests? + zig-test-flags + #:allow-other-keys) + "Run all the tests" + (when tests? + (let ((old-destdir (getenv "DESTDIR"))) + (setenv "DESTDIR" "test-out") ;; Avoid colisions with the build output + (let ((call `("zig" "build" "test" + ,@zig-test-flags))) + (format #t "running: ~s~%" call) + (apply invoke call)) + (if old-destdir + (setenv "DESTDIR" old-destdir) + (unsetenv "DESTDIR"))))) + +(define* (install #:key inputs outputs #:allow-other-keys) + "Install a given Zig package." + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "out" out))) + +(define %standard-phases + (modify-phases gnu:%standard-phases + (delete 'bootstrap) + (delete 'configure) + (add-before 'build 'set-zig-global-cache-dir set-zig-global-cache-dir) + (add-before 'build 'set-cc set-cc) + (replace 'build build) + (replace 'check check) + (replace 'install install))) + + +(define* (zig-build #:key inputs (phases %standard-phases) + #:allow-other-keys #:rest args) + "Build the given Zig package, applying all of PHASES in order." + (apply gnu:gnu-build #:inputs inputs #:phases phases args))