From patchwork Tue Apr 1 08:33:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tommy Langhelle X-Patchwork-Id: 41127 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 D6D7D27BBEA; Tue, 1 Apr 2025 15:34:50 +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=-7.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 B08CB27BBE2 for ; Tue, 1 Apr 2025 15:34:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzch3-0001zD-2T; Tue, 01 Apr 2025 10:34:21 -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 1tzcA6-0004Nk-72 for guix-patches@gnu.org; Tue, 01 Apr 2025 10:00:18 -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 1tzcA5-0000Ej-LJ for guix-patches@gnu.org; Tue, 01 Apr 2025 10:00:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=2uDdCJNBf/Ph+PIaWWkhUtEoQahpvwcQ0TRPEq7Mutk=; b=TriDxDL4mGU6COCU0jU89ksBFlLDNzKTQvmHHFeIgUFl9EGPftbmNG10AWO1kJNZtFfjc63HaKdl2MFoIHa3RPeEmT+zvvdixfYEQzYKC+6G8K2pB98NTDLGnPuDj56323YcDQJTbiiqBRQxFcGgIz6P/HZ1SFRjw6roG7LTwVTLTFG61ZqO+R8Au7VeBMOrBesAFbArJohb5I7abKZufxw8sVEePn3Vrk8AQO7SQcV7sOyb0XfRngmEbYW2s/Akfn3/taD/1NZHiaxm+TG/ItT6Wwx2LmuN6wxzN1Sb4ZpH/LAOzGlPiKgMVrg33pFtVKip2X4xBMTz+15OwdSqsQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzcA4-00010y-Rl for guix-patches@gnu.org; Tue, 01 Apr 2025 10:00:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77431] [PATCH] gnu: zig: Set rss_max to unlimited Resent-From: Tommy Langhelle Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Apr 2025 14:00:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77431 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77431@debbugs.gnu.org Cc: Tommy Langhelle X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17435159853628 (code B ref -1); Tue, 01 Apr 2025 14:00:15 +0000 Received: (at submit) by debbugs.gnu.org; 1 Apr 2025 13:59:45 +0000 Received: from localhost ([127.0.0.1]:47276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzc9K-0000us-8p for submit@debbugs.gnu.org; Tue, 01 Apr 2025 09:59:43 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40768) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tzX4R-0004sh-1I for submit@debbugs.gnu.org; Tue, 01 Apr 2025 04:34:11 -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 1tzX4I-0003oe-Nd for guix-patches@gnu.org; Tue, 01 Apr 2025 04:33:58 -0400 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tzX4C-00017J-Bx for guix-patches@gnu.org; Tue, 01 Apr 2025 04:33:58 -0400 Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-54b10594812so3687786e87.1 for ; Tue, 01 Apr 2025 01:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743496429; x=1744101229; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2uDdCJNBf/Ph+PIaWWkhUtEoQahpvwcQ0TRPEq7Mutk=; b=eixf03Q7v8dJfmx9R0tAJs7GFx1BSlB6yTABC9lZgRDw4QFVlHk1z3CN9fsNFMZTi1 xdb9oTo6inYvojXx8oy5p4rSb+h/3GqxmgrdtkJIC0caw3bJHoDYJohQCuOn8Dmf9zLg YY+kZyNDDO9C5kt3azu9r03T+WpIZ33WkoCVMX4XcFwOLMj6FV1+Ftl6rHuQc5R3DoHa JcmMC1CQSTYkU6Th6XXnJW8sQOr+k1hM8xuhOg5xZsuxX6CVODGHodq4deJZGpf4n9Ay Bckw0e8KrHFTc6OcbyPbONY8Z+yx+2s0DPd2gxOmxmP011NTAz1vxTxUqUpz5+6dieOS 5OyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743496429; x=1744101229; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2uDdCJNBf/Ph+PIaWWkhUtEoQahpvwcQ0TRPEq7Mutk=; b=TcMOBSRBD9My0UcrIUNPbtiJY70cUvq1kl98fjjc69hrBASUwGWq5Ggsu7E+dJHTic l5PGjdbv/pl1ixGUL8MQ+AMM+EddrFCAPfs+GcT8eD6m316294yTiffcXsUUaiXQl2uT BVK6gIAW0l3AvPUmXoACmmuqKF+d2kLFKffVzC2XyD+uBedTUfA02iN7WUInN5q2Nu4L oTLCKbefi5+e1nET/U4zI36PYgLCzxcHf2RL9Bgd+bWV2EaJdRb8rgFDJczwT4vPizak ah6+y9rnoiwLr+RoV146XaMJCVvkZNiAn2VCUJirus2Rnc3MK9PpaHp88O6cp7zPbUc5 siSg== X-Gm-Message-State: AOJu0Yw+3n1sPBxU1QMV0A5jVnOySShM3M+N+wTl3L47vlabaj850Ga5 VbA2Qv6Rjh7oyoB6Q/mbedUKyfRoheDujeuVCKfcBXTnJUHt066NS2q/dIb+ X-Gm-Gg: ASbGnctrLqE3g1j33EqZi7jmWsdQ8FzJ6Jg0uFoIVhnZlqYyaJLDoeZp07PQNzUstQR U+pnDwmO/a6pLteSTY2w4Amn42G06PSxagiCI6bs/6RtN2khdR6HhMf6dNW7PVXe8W7y1BG471A ex2wD4xXCIE4lpIdl0HJ0hzsihFaPnzc7ii/uys5qdmGqz+BAEUbH793BEFCWVCd6M40z5XEDpb sGg72Ui+nUFaGPYu6FidNr9UUwVOgZUFTX2a1dV0xaS02aEtWTTG1v/NHaZSOGWsIK1gGR6NjYG IIuiH1j3e6vZ+fEY5vvZ0GpU68gbj19+3NWUkR/rnAWBdpGT/1Lee/4s7vRSXPDsYQCfpnB5C/s = X-Google-Smtp-Source: AGHT+IF7jSS6uYm6tA5iJtlVLxGFdq+VSG7jKWTFbEMDP8l9UP5SCl6fChE4T5VxcczlvCIR8n0Zcw== X-Received: by 2002:a05:6512:398c:b0:549:5802:b32d with SMTP id 2adb3069b0e04-54b10db9d00mr3984878e87.3.1743496428777; Tue, 01 Apr 2025 01:33:48 -0700 (PDT) Received: from BGOMAC-tolan756.tv2asa.no ([77.75.212.71]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54b09591a01sm1287554e87.164.2025.04.01.01.33.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 01 Apr 2025 01:33:48 -0700 (PDT) From: Tommy Langhelle X-Google-Original-From: Tommy Langhelle Date: Tue, 1 Apr 2025 10:33:36 +0200 Message-ID: <20250401083336.27759-1-tommy.langhelle@tv2.no> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12d; envelope-from=tomlanghe@gmail.com; helo=mail-lf1-x12d.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 01 Apr 2025 09:59:28 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 01 Apr 2025 10:34:19 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Upstream sets this for CI purposes, but it fails my ARM builds. The limit itself doesn't make too much sense as long as zig builds and the build host is big enough, so simply allowing unlimited rss should be fine. * gnu/packages/patches/zig-0.14-set-max_rss-to-unlimited-for-building-zig.patch: New file. * gnu/packages/zig.scm (zig-0.14)[source]: Add patch. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + ...ax_rss-to-unlimited-for-building-zig.patch | 31 +++++++++++++++++++ gnu/packages/zig.scm | 3 +- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/zig-0.14-set-max_rss-to-unlimited-for-building-zig.patch base-commit: e7aeec67feaa5cf888f0aae14400fc015390aa8e diff --git a/gnu/local.mk b/gnu/local.mk index f03fcb14fc..63e87a232e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2473,6 +2473,7 @@ dist_patch_DATA = \ %D%/packages/patches/zig-0.14-fix-runpath.patch \ %D%/packages/patches/zig-0.14-use-baseline-cpu-by-default.patch \ %D%/packages/patches/zig-0.14-use-system-paths.patch \ + %D%/packages/patches/zig-0.14-set-max_rss-to-unlimited-for-building-zig.patch \ %D%/packages/patches/zsh-egrep-failing-test.patch \ %D%/packages/patches/zuo-bin-sh.patch diff --git a/gnu/packages/patches/zig-0.14-set-max_rss-to-unlimited-for-building-zig.patch b/gnu/packages/patches/zig-0.14-set-max_rss-to-unlimited-for-building-zig.patch new file mode 100644 index 0000000000..d944827353 --- /dev/null +++ b/gnu/packages/patches/zig-0.14-set-max_rss-to-unlimited-for-building-zig.patch @@ -0,0 +1,31 @@ +From 408722e084edf0a86066344e29bdfced70679129 Mon Sep 17 00:00:00 2001 +From: Tommy Langhelle +Date: Mon, 31 Mar 2025 11:47:12 +0200 +Subject: [PATCH] Set max_rss to unlimited for building zig + +https://github.com/ziglang/zig/issues/18263 + +Upstream sets this for CI purposes, but it fails my ARM builds. The +limit itself doesn't make too much sense as long as zig builds and the +build host is big enough, so simply allowing unlimited rss should be +fine. +--- + build.zig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build.zig b/build.zig +index 375cb6df09..16862fc5f9 100644 +--- a/build.zig ++++ b/build.zig +@@ -703,7 +703,7 @@ fn addCompilerStep(b: *std.Build, options: AddCompilerStepOptions) *std.Build.St + + const exe = b.addExecutable(.{ + .name = "zig", +- .max_rss = 7_800_000_000, ++ .max_rss = 0, + .root_module = compiler_mod, + }); + exe.stack_size = stack_size; +-- +2.41.0 + diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 733251242e..eb7bda8c62 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -1871,7 +1871,8 @@ (define-public zig-0.14 (search-patches "zig-0.14-use-baseline-cpu-by-default.patch" "zig-0.14-use-system-paths.patch" - "zig-0.14-fix-runpath.patch")))) + "zig-0.14-fix-runpath.patch" + "zig-0.14-set-max_rss-to-unlimited-for-building-zig.patch")))) (inputs (modify-inputs (package-inputs zig-0.13) (replace "clang" clang-19)