Received: (at 66723) by debbugs.gnu.org; 22 Nov 2023 12:12:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Nov 22 07:12:56 2023 Received: from localhost ([127.0.0.1]:58160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r5m6B-0003Uf-Rf for submit <at> debbugs.gnu.org; Wed, 22 Nov 2023 07:12:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1r5m6A-0003UU-9D for 66723 <at> debbugs.gnu.org; Wed, 22 Nov 2023 07:12:54 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1r5m61-00068N-LR; Wed, 22 Nov 2023 07:12:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=wUoVn5g83d7aNxqkvCDbagBcztwp5QZxzBk2MXKsHfc=; b=Kl//HL7gcIiV6ZnXTo8G s6RqwZoH67N3sj/RQTEpmVkbA6hrmZVqv+MbIv9y5WWJEeukjhtV61tC9NuwmMjMLwLv9WPGKsaPc TB/Yr6R4moyipXDHlij1uDSupnr8rKlJskERdLPgtwUqGjcagFX37P0huFOfviUPrjpZav4D0SPk4 bMf+ZvG3JTPBobbFtZFZ6iZPfV1Bn8XtIjAs5pnAusgOBlj8uj8rg4Yh+FyW5/+3qTdTLPJ5cwE5S /yPGBLvhSCBNyeRvBvTSKlH5imqBNk4i9/Akdzg2dAigle5WYI9FxCud4SSKsiP6LjEURRCJwOuxD N+OrdYVD1LCM3Q==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Hilton Chain <hako@HIDDEN> Subject: Re: [bug#66723] [PATCH 0/3] gnu: zig-0.10: Inherit from zig-0.9. In-Reply-To: <cover.1698134803.git.hako@HIDDEN> (Hilton Chain's message of "Tue, 24 Oct 2023 16:23:29 +0800") References: <cover.1698134803.git.hako@HIDDEN> Date: Wed, 22 Nov 2023 13:12:43 +0100 Message-ID: <87wmuakmv8.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66723 Cc: 66723 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi Hilton, Hilton Chain <hako@HIDDEN> skribis: > This series applies gexp to package arguments of zig@HIDDEN and zig@HIDDEN, and > makes the latter inherit from the former. > > I have already packaged zig@HIDDEN, which depends on LLVM 16 > (https://issues.guix.gnu.org/66701), will send the patch soon. > > Hilton Chain (3): > gnu: zig-0.10: Use gexp. > gnu: zig-0.9: Use gexp. > gnu: zig-0.10: Inherit from zig-0.9. It=E2=80=99s been a while, and I think this patch series can go in. As Nguy=E1=BB=85n Gia Phong, we should question whether to keep zig 0.9, but that can come later. Thanks! Ludo=E2=80=99.
guix-patches@HIDDEN
:bug#66723
; Package guix-patches
.
Full text available.Received: (at 66723) by debbugs.gnu.org; 19 Nov 2023 11:35:30 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Nov 19 06:35:30 2023 Received: from localhost ([127.0.0.1]:50122 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1r4g5J-0000X4-PK for submit <at> debbugs.gnu.org; Sun, 19 Nov 2023 06:35:30 -0500 Received: from layka.disroot.org ([178.21.23.139]:35424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mcsinyx@HIDDEN>) id 1r4g5F-0000Ws-T1 for 66723 <at> debbugs.gnu.org; Sun, 19 Nov 2023 06:35:28 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0BEC14127B for <66723 <at> debbugs.gnu.org>; Sun, 19 Nov 2023 12:35:23 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0NoRnIrZiscH for <66723 <at> debbugs.gnu.org>; Sun, 19 Nov 2023 12:35:22 +0100 (CET) Content-Type: multipart/signed; boundary=758f92f74a47b0285aa203d0042d7cb77b5fd9b869ca4ed24321b6a7604d; micalg=pgp-sha256; protocol="application/pgp-signature" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1700393722; bh=OsmBp5fKhJOInSYca+vn0Jvd3tD+LE0cRAECFuf0x7c=; h=Date:Subject:To:From; b=D6JmuXCBm6bYC2wPMcsZxEZLD2JN4KzLmblXMq5AuH4c3QWdRGVLPZr1IygwOTdMh XF/PvjiMftkJm2SpSupLvBqn1Onbq5CTGeT/ZS7+k/UPwkO4jZe0M+DqvtCKH1nlAO eFN2PIflbPVNVfhknM+FT6ETZuor/go+v+TXA9gBh9eLW26+C9qGQxpLiIFkNsBSHY ZgfvXvxJZyqG6vho+9D1NYqtJMvuu3HJROY8wxzYWGeqsFryDZ7/Ajapb5Ui+I+dWn RFfVS1SlvzhWHPKEpJUJ1+aPbzDoWih29Vl5RAZgCmcovd0DhTMQvuztrROb4rGr6+ HJB0TrLT8SKIQ== Date: Sun, 19 Nov 2023 20:35:13 +0900 Subject: [PATCH 0/3] gnu: zig-0.10: Inherit from zig-0.9. To: <66723 <at> debbugs.gnu.org> From: =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong?= <mcsinyx@HIDDEN> Message-Id: <CX2R5KPSM94S.223IA5MY5FJU2@guix> X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: 66723 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.9 (/) --758f92f74a47b0285aa203d0042d7cb77b5fd9b869ca4ed24321b6a7604d Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Should we keep Zig 0.9? All currently packaged Zig programs requires it anymore AFAICT, and the language is immature enough I'd argue we should only keep older versions when necessary. Your patchset adding LLVM 16 has been applied BTW, I can't wait for Zig 0.11! --758f92f74a47b0285aa203d0042d7cb77b5fd9b869ca4ed24321b6a7604d Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHIBAABCAAyFiEE6Q4RuASTNDthMuOUJxSLLAaiIksFAmVZ8vUUHG1jc2lueXhA ZGlzcm9vdC5vcmcACgkQJxSLLAaiIkve/wwAgYZU9lYA7alZN1CRCWx9XXl+FbOT DfbOUtId+rCV7flNXaPMQgSN1L2zVLcWiAmIdUfUcMXKqPG1neLNliZNywRxf+B8 dnlxpzRM7EsEGtuK1odrl+RQmnmuUgmJBpWrSVOAHIWrUeK5dc52FLr8xfQFJ8BH 2xMzD54u9mhdQa7yeY61MSpTcxIHq2JxlAW8/39uR1qLH4Kwxpayugn+2UK6TU99 x72QcI5LE9wHV4YGp75Yy51YYK80DfH9wSRCvwSr3D0vNiBs01LQxe0i6QHru6nO VbsDjlgZMJxr6JggKvssiOfVh0j8BZzpFtliA18XlNcf5LmorQIb+LRCF1Pxkyev LORM61/IAF0BB5Ndkz3/sd9aR171dx7E6DctVHLzx7zhqSPmMUmJAwhWLoFBq1Su eOJHrQ3Ifs2pIEafIOHrQBKH+M7W6/6Ke9gnZU1uASEhNOZ4Y4UIaP2rpizykZnj gJ/jCZQltAz63vxicYsTqw6I6fNSZ6kXEzS0 =GGHj -----END PGP SIGNATURE----- --758f92f74a47b0285aa203d0042d7cb77b5fd9b869ca4ed24321b6a7604d--
guix-patches@HIDDEN
:bug#66723
; Package guix-patches
.
Full text available.Received: (at 66723) by debbugs.gnu.org; 24 Oct 2023 08:37:02 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Oct 24 04:37:02 2023 Received: from localhost ([127.0.0.1]:53039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qvCuL-0006IL-FC for submit <at> debbugs.gnu.org; Tue, 24 Oct 2023 04:37:02 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:51818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qvCuJ-0006IC-PE for 66723 <at> debbugs.gnu.org; Tue, 24 Oct 2023 04:37:00 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698136432; 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=vi7MwrA3z8PFLQJKvD/UdeZyY+7EqmCUu7lehFt9mlE=; b=pI/T2isLWT8ZFNHUujMhpXh5wlXnKDOMS7l0tiHzGD6lmynI67v2nrT8EnjiIhsEiRHYNv tQM3fZhdLid2VhqCC3nrkns5F3VnVNXb2VK8mtZ8WJyyJR3dKQrAHbKeCk0ZLzd88sw8lV /376XPBb39O26y5daONjmSyOne5EyU4MdvbM8M9+9mzwYrYBFACXfW62ZcFDlaGJ4Exyco 666PF0cMYN9xIO/RFGhSPToEusCg8mXyLow2KdfP1rH0Ar+lV1xA20Tjia1JsF789YeEmj N3v+Fj6XGYOARFegg2sMqUAebdwEz6HKzUePFVHGQ0oWvJvvoVhnCVqI62psoQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN To: 66723 <at> debbugs.gnu.org Subject: [PATCH 3/3] gnu: zig-0.10: Inherit from zig-0.9. Date: Tue, 24 Oct 2023 16:34:03 +0800 Message-ID: <8bea7b0450d0aecf803c9f37465cec9b9db7540b.1698134803.git.hako@HIDDEN> In-Reply-To: <cover.1698134803.git.hako@HIDDEN> References: <cover.1698134803.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66723 Cc: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/zig.scm (zig-0.9): Expand definition. (zig-0.10): Inherit from zig-0.9. Change-Id: I36c273ac3f08982f598fa934571c1b83437cb977 --- gnu/packages/zig.scm | 179 +++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 91 deletions(-) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index bc3e1c019a..08ee650d8b 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -30,10 +30,10 @@ (define-module (gnu packages zig) #:use-module (gnu packages compression) #:use-module (gnu packages llvm)) -(define-public zig-0.10 +(define-public zig-0.9 (package (name "zig") - (version "0.10.1") + (version "0.9.1") (source (origin (method git-fetch) @@ -42,57 +42,66 @@ (define-public zig-0.10 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")) - (patches (search-patches "zig-do-not-link-against-librt.patch")))) + (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) + (patches (search-patches "zig-0.9-riscv-support.patch" + "zig-use-system-paths.patch" + "zig-do-not-link-against-librt.patch")))) (build-system cmake-build-system) - (inputs - (list clang-15 ; Clang propagates llvm. - lld-15 - zlib - (list zstd "lib"))) - ;; Zig compiles fine with GCC, but also needs native LLVM libraries. - (native-inputs - (list llvm-15)) (arguments (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 + '())) + #:out-of-source? #f ; for tests + ;; There are too many unclear test failures. + #:tests? (not (or (target-riscv64?) + (%current-target-system))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'set-env-variables + #$@(if (target-riscv64?) + ;; It is unclear why all these tests fail to build. + `((add-after 'unpack 'adjust-tests + (lambda _ + (substitute* "build.zig" + ((".*addRuntimeSafetyTests.*") "") + ((".*addRunTranslatedCTests.*") "")) + (substitute* "test/standalone.zig" + ;; These tests fail to build on riscv64-linux. + ;; They both contain 'exe.linkSystemLibrary("c");' + ((".*shared_library.*") "") + ((".*mix_o_files.*") "") + ;; ld.lld: error: undefined symbol: __tls_get_addr + ;; Is this symbol x86 only in glibc? + ((".*link_static_lib_as_system_lib.*") ""))))) + '()) + (add-after 'configure 'set-cache-dir (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" + ;; Testing the standard library takes >7.5GB RAM, and + ;; will fail if it is OOM-killed. The 'test-toolchain' + ;; target skips standard library and doc tests. + "build" "test-toolchain" + ;; Stage 2 is experimental, not what we run with `zig', + "-Dskip-stage2-tests" ;; Non-native tests try to link and execute non-native ;; binaries. "-Dskip-non-native"))))))) + (inputs + (list clang-13 ;Clang propagates llvm. + lld-13)) + ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (native-inputs + (list llvm-13)) (native-search-paths (list (search-path-specification @@ -123,11 +132,11 @@ (define-public zig-0.10 (properties `((max-silent-time . 9600))) (license license:expat))) -(define-public zig-0.9 +(define-public zig-0.10 (package - (inherit zig-0.10) + (inherit zig-0.9) (name "zig") - (version "0.9.1") + (version "0.10.1") (source (origin (method git-fetch) @@ -136,64 +145,52 @@ (define-public zig-0.9 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) - (patches (search-patches "zig-0.9-riscv-support.patch" - "zig-use-system-paths.patch" - "zig-do-not-link-against-librt.patch")))) + (base32 "1sh5xjsksl52i4cfv1qj36sz5h0ln7cq4pdhgs3960mk8a90im7b")) + (patches (search-patches "zig-do-not-link-against-librt.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments zig-0.9) + ((#:configure-flags flags ''()) + #~(cons* "-DZIG_TARGET_MCPU=baseline" + "-DZIG_SHARED_LLVM=ON" + (string-append "-DZIG_LIB_DIR=" #$output "/lib/zig") + #$flags)) + ;; TODO: zig binary can't find ld-linux. + ((#:validate-runpath? _ #t) #f) + ((#:tests? _ #t) #t) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + #$@(if (target-riscv64?) + `((delete 'adjust-tests)) + '()) + (add-after 'unpack 'set-CC + (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)))) + (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"))))) + (replace '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")))))))) (inputs - (list clang-13 ; Clang propagates llvm. - lld-13)) - ;; Zig compiles fine with GCC, but also needs native LLVM libraries. + (modify-inputs (package-inputs zig-0.9) + (prepend zlib `(,zstd "lib")) + (replace "clang" clang-15) + (replace "lld" lld-15))) (native-inputs - (list llvm-13)) - (arguments - (list - #:configure-flags - #~(list #$@(if (%current-target-system) - (list (string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system))) - '())) - #:out-of-source? #f ; for tests - ;; There are too many unclear test failures. - #:tests? (not (or (target-riscv64?) - (%current-target-system))) - #:phases - #~(modify-phases %standard-phases - (add-after 'configure 'set-cache-dir - (lambda _ - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - #$@(if (target-riscv64?) - ;; It is unclear why all these tests fail to build. - `((add-after 'unpack 'adjust-tests - (lambda _ - (substitute* "build.zig" - ((".*addRuntimeSafetyTests.*") "") - ((".*addRunTranslatedCTests.*") "")) - (substitute* "test/standalone.zig" - ;; These tests fail to build on riscv64-linux. - ;; They both contain 'exe.linkSystemLibrary("c");' - ((".*shared_library.*") "") - ((".*mix_o_files.*") "") - ;; ld.lld: error: undefined symbol: __tls_get_addr - ;; Is this symbol x86 only in glibc? - ((".*link_static_lib_as_system_lib.*") ""))))) - '()) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke (string-append #$output "/bin/zig") - ;; Testing the standard library takes >7.5GB RAM, and - ;; will fail if it is OOM-killed. The 'test-toolchain' - ;; target skips standard library and doc tests. - "build" "test-toolchain" - ;; Stage 2 is experimental, not what we run with `zig', - - "-Dskip-stage2-tests" - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))))) + (modify-inputs (package-native-inputs zig-0.9) + (replace "llvm" llvm-15))))) (define-public zig zig-0.10) -- 2.41.0
guix-patches@HIDDEN
:bug#66723
; Package guix-patches
.
Full text available.Received: (at 66723) by debbugs.gnu.org; 24 Oct 2023 08:36:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Oct 24 04:36:59 2023 Received: from localhost ([127.0.0.1]:53036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qvCuJ-0006I6-1i for submit <at> debbugs.gnu.org; Tue, 24 Oct 2023 04:36:59 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:34358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qvCuE-0006Ho-0X for 66723 <at> debbugs.gnu.org; Tue, 24 Oct 2023 04:36:54 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698136428; 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=sSWTlk0xCvvMYql2Rz74QgDSmcrtf+s8dGuFFd6KlR8=; b=IAkc73almOg6jOcS+cwwOUdyFsKb50Qj+6jumrCf8n08efeTohsocrtc/T8/sttuo1ehrJ G6s8gZUk5BwhqyZ0vkSqqLw2db09l3zRQK/SKHijwkEIcNyzVFWdNXxpG9e3RxxRmJmx3g Sik0kv82hsmZgnAHNTjAvzryRuG/JkY+tO8g098CWxWSxgSHuehxI8qmyzX0D9vXLND3GJ vDnJ2XCqCeDkmNn/C+esUIgzxRxyA+balEObthKXaGkS6C6gYNZ1ZatYXZUznxiF9YBK4R 3pEbaY0vn5Z5Euv02jvxvwRSHhbftoI1x16hb8C1xoqkQB0vQaJ6DIAHLb76jw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN To: 66723 <at> debbugs.gnu.org Subject: [PATCH 2/3] gnu: zig-0.9: Use gexp. Date: Tue, 24 Oct 2023 16:34:02 +0800 Message-ID: <55d3d44464c9b3df92a179c117669bd071066c05.1698134803.git.hako@HIDDEN> In-Reply-To: <cover.1698134803.git.hako@HIDDEN> References: <cover.1698134803.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66723 Cc: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/zig.scm (zig-0.9)[arguments]: Use gexp. Change-Id: I38c856320ace6d960ae342f5de164ca6c3f449c0 --- gnu/packages/zig.scm | 95 ++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 882e5426dc..bc3e1c019a 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -147,52 +147,53 @@ (define-public zig-0.9 (native-inputs (list llvm-13)) (arguments - `(#:configure-flags - (list ,@(if (%current-target-system) - (string-append "-DZIG_TARGET_TRIPLE=" - (%current-target-system)) - '())) - #:out-of-source? #f ; for tests - ;; There are too many unclear test failures. - #:tests? ,(not (or (target-riscv64?) - (%current-target-system))) - #:phases - (modify-phases %standard-phases - (add-after 'configure 'set-cache-dir - (lambda _ - ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")))) - ,@(if (target-riscv64?) - ;; It is unclear why all these tests fail to build. - `((add-after 'unpack 'adjust-tests - (lambda _ - (substitute* "build.zig" - ((".*addRuntimeSafetyTests.*") "") - ((".*addRunTranslatedCTests.*") "")) - (substitute* "test/standalone.zig" - ;; These tests fail to build on riscv64-linux. - ;; They both contain 'exe.linkSystemLibrary("c");' - ((".*shared_library.*") "") - ((".*mix_o_files.*") "") - ;; ld.lld: error: undefined symbol: __tls_get_addr - ;; Is this symbol x86 only in glibc? - ((".*link_static_lib_as_system_lib.*") ""))))) - '()) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs tests? #:allow-other-keys) - (when tests? - (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - ;; Testing the standard library takes >7.5GB RAM, and - ;; will fail if it is OOM-killed. The 'test-toolchain' - ;; target skips standard library and doc tests. - "build" "test-toolchain" - ;; Stage 2 is experimental, not what we run with `zig', - ;; and stage 2 tests require a lot of RAM. - "-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))) + '())) + #:out-of-source? #f ; for tests + ;; There are too many unclear test failures. + #:tests? (not (or (target-riscv64?) + (%current-target-system))) + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'set-cache-dir + (lambda _ + ;; Set cache dir, otherwise Zig looks for `$HOME/.cache'. + (setenv "ZIG_GLOBAL_CACHE_DIR" + (string-append (getcwd) "/zig-cache")))) + #$@(if (target-riscv64?) + ;; It is unclear why all these tests fail to build. + `((add-after 'unpack 'adjust-tests + (lambda _ + (substitute* "build.zig" + ((".*addRuntimeSafetyTests.*") "") + ((".*addRunTranslatedCTests.*") "")) + (substitute* "test/standalone.zig" + ;; These tests fail to build on riscv64-linux. + ;; They both contain 'exe.linkSystemLibrary("c");' + ((".*shared_library.*") "") + ((".*mix_o_files.*") "") + ;; ld.lld: error: undefined symbol: __tls_get_addr + ;; Is this symbol x86 only in glibc? + ((".*link_static_lib_as_system_lib.*") ""))))) + '()) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke (string-append #$output "/bin/zig") + ;; Testing the standard library takes >7.5GB RAM, and + ;; will fail if it is OOM-killed. The 'test-toolchain' + ;; target skips standard library and doc tests. + "build" "test-toolchain" + ;; Stage 2 is experimental, not what we run with `zig', + + "-Dskip-stage2-tests" + ;; Non-native tests try to link and execute non-native + ;; binaries. + "-Dskip-non-native"))))))))) (define-public zig zig-0.10) -- 2.41.0
guix-patches@HIDDEN
:bug#66723
; Package guix-patches
.
Full text available.Received: (at 66723) by debbugs.gnu.org; 24 Oct 2023 08:36:55 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Oct 24 04:36:55 2023 Received: from localhost ([127.0.0.1]:53034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qvCuE-0006Hv-IR for submit <at> 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 <hako@HIDDEN>) id 1qvCuB-0006Hf-Qd for 66723 <at> debbugs.gnu.org; Tue, 24 Oct 2023 04:36:53 -0400 From: Hilton Chain <hako@HIDDEN> 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== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN To: 66723 <at> debbugs.gnu.org Subject: [PATCH 1/3] gnu: zig-0.10: Use gexp. Date: Tue, 24 Oct 2023 16:34:01 +0800 Message-ID: <33d45edb223f76b040da723a4b20f3dfaab6ed8f.1698134803.git.hako@HIDDEN> In-Reply-To: <cover.1698134803.git.hako@HIDDEN> References: <cover.1698134803.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66723 Cc: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * 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 <http://www.gnu.org/licenses/>. (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
guix-patches@HIDDEN
:bug#66723
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 24 Oct 2023 08:24:35 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Oct 24 04:24:35 2023 Received: from localhost ([127.0.0.1]:53015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qvCiJ-0003Nc-8x for submit <at> debbugs.gnu.org; Tue, 24 Oct 2023 04:24:35 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <hako@HIDDEN>) id 1qvCiG-0003NG-9B for submit <at> debbugs.gnu.org; Tue, 24 Oct 2023 04:24: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 <hako@HIDDEN>) id 1qvChg-00005P-AV for guix-patches@HIDDEN; Tue, 24 Oct 2023 04:23:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <hako@HIDDEN>) id 1qvChd-0007yI-GK for guix-patches@HIDDEN; Tue, 24 Oct 2023 04:23:55 -0400 From: Hilton Chain <hako@HIDDEN> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1698135667; 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; bh=Lt8E2CHq+62jwqQ9aWfNjoQYW4ZXH9QjJWDNjZR95r8=; b=kSREFYDWZengW223oVOQkeHqDJ3Ra0vm3vBWn141mx2Nuaw2LfdxjLZiEqSyxssxiV1bQZ x5WGe0WRz6ZPwF7p40VhtsidHDXj2+fS0AHue4gCpszwaED8QTgSL4u4sqm+P7udaMuGF4 S2qcjIhIyguR2PPaifVo9TbO/H7DCAtMUpWNt39jYG20/BaqYe21tTWYZ0M3KwqG5b24BV EffeTn5PUpO9c+d8B9ZrhlvrveWdgFfnj/J1ViR+xxKhs6KGxmdT5kD9AE3g6EvY+xkm+W A9mLKEn8mDNxplyayEOARw/L+eTFiwtmNEFPZZfY3ijHp5JL9wEDS3QpfsqdyA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@HIDDEN To: guix-patches@HIDDEN Subject: [PATCH 0/3] gnu: zig-0.10: Inherit from zig-0.9. Date: Tue, 24 Oct 2023 16:23:29 +0800 Message-ID: <cover.1698134803.git.hako@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Level: * X-Spamd-Bar: + Received-SPF: pass client-ip=144.168.59.46; envelope-from=hako@HIDDEN; helo=mail.boiledscript.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Hilton Chain <hako@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) This series applies gexp to package arguments of zig@HIDDEN and zig@HIDDEN, and makes the latter inherit from the former. I have already packaged zig@HIDDEN, which depends on LLVM 16 (https://issues.guix.gnu.org/66701), will send the patch soon. Hilton Chain (3): gnu: zig-0.10: Use gexp. gnu: zig-0.9: Use gexp. gnu: zig-0.10: Inherit from zig-0.9. gnu/packages/zig.scm | 215 +++++++++++++++++++++---------------------- 1 file changed, 107 insertions(+), 108 deletions(-) base-commit: be223a9451cc7bf7437c8fb2ee13f6ed726e6097 -- 2.41.0
Hilton Chain <hako@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#66723
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.