From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id aOS6GxuCN2VFAAAAG6o9tA:P1 (envelope-from ) for ; Tue, 24 Oct 2023 10:36:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aOS6GxuCN2VFAAAAG6o9tA (envelope-from ) for ; Tue, 24 Oct 2023 10:36:43 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C8137402AD for ; Tue, 24 Oct 2023 10:36:42 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=d01gwLGQ; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1698136603; a=rsa-sha256; cv=none; b=UKJF4V9j7PbAlT5KZZz4ZNamY34mwOuXqTPn4VHTVKlXdRfYavcn/eiWEwNQgMckWMMuhJ 77+Zk+T2gSfR6x856zmjC3b9GcVL/DguUDeKx7+ku+wfkbfMCNIgdmcpHoi3tr7V987tdA oK8HOmsdS40hWBDa/q1OSZktCfyhUY9GYQoVJDDVYNh1+a5yLHd9fVkPAnNfy6Rp9YZpoA Vt8B4ThXhUTnAKV+CO4yBYN02OKSdFeNBM4DpbcnzxKBEwgqb0Jbgpnvknwq0waoktDh7X 8sjmzbxYnJrjdoq5UWDafUt0bDBOu0A3UXZcsk/SsI7tHlLcSDNPAXJqxKdVSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=d01gwLGQ; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1698136603; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=YtkyO1IxqPaxoZ6MnIWi1d0XAf/+dItJ72JB5Yh8iP0=; b=cSqyJz4PVh4Md9wI+2ERXj8lIlKIexMNRdjo6bq2jqwnxiCjjRVG+v160RuZoEg+rwsgFS Rp4dGp1nYjUPYs14o0a3GL0Edodch3dAzVj9ObDEfqeZZJ2FNTwHiZUlw4dL7UAwbYRgnh 372aXRrcpdb3sm88NLxAbz2iu1p6rcOWz7auqNe9EMyL2EnEvpveUJhqycTPwxnyefVlaZ XvG/39W4ushheBEk1Jh/G+RnYV/y21TsYuJqUugoFKQV5IhZn5AlTbQNCHf+BRGtswUoUu 3FbygWkg4t1jVRC3fAtc6c5pp/Bwv/HCc9st4RCxvpmohiVZaGJF87mLHSgV4w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvCtu-00011d-N2; Tue, 24 Oct 2023 04:36:34 -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 1qvCtt-00010x-42 for guix-patches@gnu.org; Tue, 24 Oct 2023 04:36:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvCts-0002JT-Ru for guix-patches@gnu.org; Tue, 24 Oct 2023 04:36:32 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qvCuM-0006IZ-9p for guix-patches@gnu.org; Tue, 24 Oct 2023 04:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66723] [PATCH 1/3] gnu: zig-0.10: Use gexp. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 24 Oct 2023 08:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66723@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 66723-submit@debbugs.gnu.org id=B66723.169813661524179 (code B ref 66723); Tue, 24 Oct 2023 08:37:02 +0000 Received: (at 66723) by debbugs.gnu.org; 24 Oct 2023 08:36:55 +0000 Received: from localhost ([127.0.0.1]:53034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvCuE-0006Hv-IR for submit@debbugs.gnu.org; Tue, 24 Oct 2023 04:36:55 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:34348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qvCuB-0006Hf-Qd for 66723@debbugs.gnu.org; Tue, 24 Oct 2023 04:36:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698136425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YtkyO1IxqPaxoZ6MnIWi1d0XAf/+dItJ72JB5Yh8iP0=; b=d01gwLGQSpbl5sl/xbr9dlIggEPWfqAUiQy2IRnQieRJar4W4tisM9/mLlieFo9hMSah5/ h1WxaA213p6QHc5hLx+1FwtzXOc51c8TXfVV8BjMnONxrrUNii2dBGQwbnI7BN8Iqb7LOn YIsPZurz2BfxIeHIDX65D2tL0zKneVrPwbDEIKDostxs+R2ot4v+D/qJh5WlOmy277dlpL mHHXcaWTeeF7t8R5d2HlvUKSNclMw0y9am1a+Vczim0O14Di9ETc8xK0LiX+SkhjTU2Z1d vF+zTCGbIH95Bu97JffNgb5JcFfB3sHbhk4+XNH1vImM63NrTx5WEg8mAMnyiw== Date: Tue, 24 Oct 2023 16:34:01 +0800 Message-ID: <33d45edb223f76b040da723a4b20f3dfaab6ed8f.1698134803.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: -6.13 X-Spam-Score: -6.13 X-Migadu-Queue-Id: C8137402AD X-TUID: p5FBDKfpHky4 * gnu/packages/zig.scm (zig-0.10)[arguments]: Use gexp. Change-Id: I8ba6a4bd92784637cd3a4448e2f99ed521a17f3a --- gnu/packages/zig.scm | 79 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index dcca9a1121..882e5426dc 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -20,6 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages zig) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix git-download) @@ -53,45 +54,45 @@ (define-public zig-0.10 (native-inputs (list llvm-15)) (arguments - `(#:configure-flags - (list ,@(if (%current-target-system) - '(string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '()) - (string-append "-DZIG_TARGET_MCPU=baseline") - "-DZIG_SHARED_LLVM=ON" - (string-append "-DZIG_LIB_DIR=" (assoc-ref %outputs "out") - "/lib/zig")) - #:validate-runpath? #f ; TODO: zig binary can't find ld-linux. - #:out-of-source? #f ; for tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-env-variables - (lambda* (#:key inputs native-inputs #:allow-other-keys) - ;; Set CC, since the stage 2 zig relies on it to find the libc - ;; installation, and otherwise silently links against its own. - (setenv "CC" ,(cc-for-target)) - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - (add-after 'patch-source-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - ;; Zig uses information about /usr/bin/env to determine the - ;; version of glibc and other data. - (substitute* "lib/std/zig/system/NativeTargetInfo.zig" - (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - "build" "test" - ;; We're not testing the compiler bootstrap chain. - "-Dskip-stage1" - "-Dskip-stage2-tests" - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))) + (list + #:configure-flags + #~(list #$@(if (%current-target-system) + (list (string-append "-DZIG_TARGET_TRIPLE=" + (%current-target-system))) + '()) + "-DZIG_TARGET_MCPU=baseline" + "-DZIG_SHARED_LLVM=ON" + (string-append "-DZIG_LIB_DIR=" #$output "/lib/zig")) + #:validate-runpath? #f ;TODO: zig binary can't find ld-linux. + #:out-of-source? #f ;for tests + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-env-variables + (lambda _ + ;; Set CC, since the stage 2 zig relies on it to find the libc + ;; installation, and otherwise silently links against its own. + (setenv "CC" #$(cc-for-target)) + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + (add-after 'patch-source-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + ;; Zig uses information about /usr/bin/env to determine the + ;; version of glibc and other data. + (substitute* "lib/std/zig/system/NativeTargetInfo.zig" + (("/usr/bin/env") (search-input-file inputs "/bin/env"))))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke (string-append #$output "/bin/zig") + "build" "test" + ;; We're not testing the compiler bootstrap chain. + "-Dskip-stage1" + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))) (native-search-paths (list (search-path-specification -- 2.41.0