Received: (at 74909) by debbugs.gnu.org; 16 Dec 2024 06:30:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Dec 16 01:30:09 2024
Received: from localhost ([127.0.0.1]:53228 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tN4cL-00057D-Cd
for submit <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:30:09 -0500
Received: from mail-pf1-f175.google.com ([209.85.210.175]:42113)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tN4c8-00052r-53
for 74909 <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:30:03 -0500
Received: by mail-pf1-f175.google.com with SMTP id
d2e1a72fcca58-728e78c4d7bso2628766b3a.0
for <74909 <at> debbugs.gnu.org>; Sun, 15 Dec 2024 22:29:56 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734330535; x=1734935335; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=PGtLOcOvkoAUgrQpD81B7l1n+dGLaLautWqFpgZ4850=;
b=O8/BPH00vmfKHzPq5P438d/DbflPapDfbLAvyZORWwefSFB1q2yl4nphK0jSDNcdMk
dSIr7hYhxIqA21CP3ohf2W+pJtzjGBrw/haipJsWDObUSeQzTsWCxDlYNApmXKES/3x2
T7f9sbAirziSbR5B7NkH4gwbTjxJtknKqqSI/AT7bLCbWX9ekZGYwMJLrK021M5C/puz
7Le+FPZI7daDxtzMlT5S1S2dq4vcLSXi21dpcUC16iYwPA7u6lQBgP3fbRlLB1Avk6Hh
G1wYc4tDqdxymQZz3cKa14sfIxW2GR2A1gf3rCP99VMOkukQGrdiwCaohvFwO0fmgIaO
3ZKg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734330535; x=1734935335;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=PGtLOcOvkoAUgrQpD81B7l1n+dGLaLautWqFpgZ4850=;
b=pS4F5bVV2r7xIlH0Eh6HeIp8VFdV8ggnWLc9jky2vVE6unGo+/h5yX7gH7BiJB1sQI
kX67Ujgs/17tSBjnlQdTl4VHL0Q+4EezPi0s3uj3I9jn/hDev1oa/sAhLUfv1N9WExhP
vgYWTdV7Wygz9CJpba3j9MP884HeJyN3X9E1oa9DRFE4TXJI3+kBsfRlomQ+iIXt6dgn
XwnS9+iqi/2Lbq2N45KVbwvdm49mBzF39YgNvTcqsPIDXDGqkHGio/ZnupPMAPcxJHYm
N9tVemEidtsrEwpuA20lr0cJWsqLokFIPX7acve5EfhnxmFyD5X3VF6OhQg3LIE6Ca9G
tobw==
X-Gm-Message-State: AOJu0YxsRxnsD49a5CMuWYQOWJT+xk0dON+th5PwQwA32BQGlAI6oW66
zDP6SsyKYKQ8f4vcOURh7JQmGTprhTIHYp/oV5eegNODllwBOFDi/EoUag==
X-Gm-Gg: ASbGncuWj3iEKjZ3NugAJFTrcjr2AXLo7odTvCB1sRpy2Q/5vWRgTVeRtVhd64kSya+
4jmZJ4t/its0vjTh7QhEPbJo+0/4HByecWoIJHA0siCAMgv8+1d6T5FtTsujHU0xBWwouDEaxno
B1MFZQ5JObz7Jitzcn5hy+L1qT1qXMInjTniNvfWcePU7gXib2zohtjBM/b2KpMgykLokDihIxQ
0tEIj+mcaaYzQWO8fB/ibv0sp0J3smO5R4OVG9E+6CE+cQSCvTY37FLYGW0GNActnbPItdip6c=
X-Google-Smtp-Source: AGHT+IGFMNQvl81WbHH3ucrEFD/Ja7f03pJ24GqGtw9s1qpYLME7wolYYlb5xEbGI0TT7yBg40mLKQ==
X-Received: by 2002:a05:6a21:b8d:b0:1e1:adcd:eadb with SMTP id
adf61e73a8af0-1e1e000c365mr14143519637.11.1734330534894;
Sun, 15 Dec 2024 22:28:54 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-72918b788d1sm3948509b3a.110.2024.12.15.22.28.53
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 15 Dec 2024 22:28:54 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74909 <at> debbugs.gnu.org
Subject: [PATCH 3/3] build/guile-build-system: Fix byte-compilation warnings.
Date: Mon, 16 Dec 2024 15:28:05 +0900
Message-ID: <212e93c9b6e20be25a0479b3fee8af8ad633df32.1734329084.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1734329084.git.maxim.cournoyer@HIDDEN>
References: <cover.1734329084.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74909
Cc: Maxim Cournoyer <maxim.cournoyer@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 (-)
* guix/build/guile-build-system.scm: Hide 'delete' from (guix build utils), to
avoid shadowing the builtin.
(invoke-each): Replace current-processor-count with parallel-job-count. The
former would require importing (ice-9 threads).
Change-Id: I7cde3305b9017bfec52ffe50ed124e21cbdceb25
---
guix/build/guile-build-system.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm
index b497573c0a..d2198b6715 100644
--- a/guix/build/guile-build-system.scm
+++ b/guix/build/guile-build-system.scm
@@ -18,7 +18,7 @@
(define-module (guix build guile-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
- #:use-module (guix build utils)
+ #:use-module ((guix build utils) #:hide (delete))
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
@@ -79,7 +79,7 @@ (define* (set-locale-path #:key inputs native-inputs
(setenv "GUIX_LOCPATH" (string-append locales "/lib/locale")))))
(define* (invoke-each commands
- #:key (max-processes (current-processor-count))
+ #:key (max-processes (parallel-job-count))
report-progress)
"Run each command in COMMANDS in a separate process, using up to
MAX-PROCESSES processes in parallel. Call REPORT-PROGRESS at each step.
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74909; Package guix-patches.
Full text available.
Received: (at 74909) by debbugs.gnu.org; 16 Dec 2024 06:30:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Dec 16 01:30:08 2024
Received: from localhost ([127.0.0.1]:53220 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tN4cE-00053n-PC
for submit <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:30:08 -0500
Received: from mail-pf1-f182.google.com ([209.85.210.182]:56642)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tN4c5-00052W-2Z
for 74909 <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:29:59 -0500
Received: by mail-pf1-f182.google.com with SMTP id
d2e1a72fcca58-725d9f57d90so2615014b3a.1
for <74909 <at> debbugs.gnu.org>; Sun, 15 Dec 2024 22:29:53 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734330526; x=1734935326; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=FaGxAwMCpkr8ehOFXuLM2n1JC/DVatYX6fstQY3fp9s=;
b=XRTt3vAS/WeVQ2D25C76ynL0PVBglac5JGbDoXA7cUMDblnNGPonU3PwTLfrki9ln9
7Se/KwN79HTnyJxbCsd3YBdz4z0A/6ECTvlomsN6U6MXmQF7o6epqfKEJgIBvnf9zSZO
oyws486LHg/XnzCDhwjJ6/jYeR+qN7HQb4kdMCAXaUYO+765p1Sh6BTjjzTWNG3y7llh
UhQYSJ/F9wUCIyVwFy7x0z7JDiv+Gkwdf4U5T6tmAChwQ/f+YF1zCdNE6qieyKq8X5Sl
fP86WiUQ4r5hTCKXDcDqx6TX+JjOmw4ANBOb9yZVlcMd8pSKEEmv1u+RicnYi4NfKe0C
QeXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734330526; x=1734935326;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=FaGxAwMCpkr8ehOFXuLM2n1JC/DVatYX6fstQY3fp9s=;
b=YUEsnF7Vb1/jD0ZoNXwr+lbvsK4TMIJ8G22Zuh+0isBNvoLIgvO3nKbnEbN80yljK6
K2zSXz2fKsM0qQoWTrIokrYGXkKik1XT5UgbsM96+vDeFNPYmCxCfXykCIyq1RW+YOrx
Fo3q7tfUj5gC1KdH2rFvR0qPRVabwqMmCtcNqNcQ3/tZLe3bXZTtgdZzXajLdfAeVAEq
QLReiXxXcUnzXJnPu65aEi1GTD9pJg3Ch90d4xFg77as/ZSdNPsZMFE+m5C/fDMh5n0N
mPm0gcz86itIKrtqAeluJSHWwjo02aXmiosx+XL/sxriGD6vG6W2VqNmMfO6wDzD+J2J
oMTw==
X-Gm-Message-State: AOJu0Yydf2ukZm3bPlrAX9Fl6XgBE7Nz+4uR5VEG7lM+JDVekkzFkBP3
t2xPWawf2ReNoWV+6fx1MzGcx7CewfwxzRnLII0zN6WjgoOtKyER28CwUA==
X-Gm-Gg: ASbGncvienh/hVtUF2p3FE9ucjUnL+TiHd/5bE2IQpdLFw99GDZiPH5KPf49ijolr76
h3aE4/Rh54XBffuqXGm+wWyMkLAtbA/HiFhYHIC5DJgR2uW0LsFoKEclUmOBrtCZg6AMJLchgOr
yoQNF3GOcnpqMmI672pJLfMX61n6S9BI9zubyJiZfDqVg3peW27YxkPVJ0bRj2L899x/WMoFTGm
9Xvtc4wQ+oyf+qlBGhqHKcVTBrZWGKnbj4MO2HqB9VC5GlHQlug9ObfcVqaKvipKaQY63vkXQQ=
X-Google-Smtp-Source: AGHT+IEZcscW/RChLO3I5mDJRoENeKaV6isvifrHgtZOhsK1K0HldKC1njt+Ty/sVXaBFK5qDgQHpA==
X-Received: by 2002:a05:6a00:3e21:b0:728:eb32:356c with SMTP id
d2e1a72fcca58-7290c181477mr16511623b3a.11.1734330526168;
Sun, 15 Dec 2024 22:28:46 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-72918b788d1sm3948509b3a.110.2024.12.15.22.28.44
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 15 Dec 2024 22:28:45 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74909 <at> debbugs.gnu.org
Subject: [PATCH 1/3] build/guile-build-system: Remove trailing #t in phases.
Date: Mon, 16 Dec 2024 15:28:03 +0900
Message-ID: <8e4bf4f91b8b034ef216e87ca6720f9dd8361a7b.1734329084.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1734329084.git.maxim.cournoyer@HIDDEN>
References: <cover.1734329084.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74909
Cc: Maxim Cournoyer <maxim.cournoyer@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 (-)
* guix/build/guile-build-system.scm (set-locale-path): Delete trailing #t.
(invoke-each, build, install-documentation): Likewise.
Change-Id: I7a0d035b9bef2160856e141642dee70974c571db
---
guix/build/guile-build-system.scm | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm
index 8927da224a..37a1654ce4 100644
--- a/guix/build/guile-build-system.scm
+++ b/guix/build/guile-build-system.scm
@@ -76,8 +76,7 @@ (define* (set-locale-path #:key inputs native-inputs
(match (assoc-ref (or native-inputs inputs) "locales")
(#f #t)
(locales
- (setenv "GUIX_LOCPATH" (string-append locales "/lib/locale"))
- #t)))
+ (setenv "GUIX_LOCPATH" (string-append locales "/lib/locale")))))
(define* (invoke-each commands
#:key (max-processes (current-processor-count))
@@ -112,8 +111,7 @@ (define* (invoke-each commands
(lambda ()
(primitive-exit 127))))
(pid
- (hashv-set! processes pid command)
- #t)))
+ (hashv-set! processes pid command))))
(let loop ((commands commands)
(running 0)
@@ -208,8 +206,7 @@ (define* (build #:key outputs inputs native-inputs
flags)))
source-files)
#:max-processes (parallel-job-count)
- #:report-progress report-build-progress))
- #t))
+ #:report-progress report-build-progress))))
(define* (install-documentation #:key outputs
(documentation-file-regexp
@@ -220,8 +217,7 @@ (define* (install-documentation #:key outputs
(doc (string-append out "/share/doc/"
(strip-store-file-name out))))
(for-each (cut install-file <> doc)
- (find-files "." documentation-file-regexp))
- #t))
+ (find-files "." documentation-file-regexp))))
(define %standard-phases
(modify-phases gnu:%standard-phases
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74909; Package guix-patches.
Full text available.
Received: (at 74909) by debbugs.gnu.org; 16 Dec 2024 06:29:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Dec 16 01:29:59 2024
Received: from localhost ([127.0.0.1]:53217 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tN4c6-00052p-LK
for submit <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:29:59 -0500
Received: from mail-pf1-f179.google.com ([209.85.210.179]:45305)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tN4c4-00052h-Rb
for 74909 <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:29:53 -0500
Received: by mail-pf1-f179.google.com with SMTP id
d2e1a72fcca58-728e81257bfso2742901b3a.2
for <74909 <at> debbugs.gnu.org>; Sun, 15 Dec 2024 22:29:52 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1734330531; x=1734935331; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=kHrFnMpSHPELNBCjsgb8Cm4fGwJuXB32p4vdMwGhjtk=;
b=f5wRqrnvzjbcZb9B/8WwizmM+fYrQ/c3X6Mu++1fldSmB2jBbjU6TeoeyptX5ggfxN
wYnFNBqf9XB9fKTEopERNYo2MRMqt3uYMeZ5QZRUDa1r2JO1QXwK9LETmZjhnf5O8CAC
EUTMndE8R37jBwb+2QqJ6b5J0b06WFfc8gfGhGEzHgYcuWzijqSCHSEvOBvdvtn9+28s
RS2sHrWTcIxRbkE2QCQ2glFX0z5IdmuTFq9xz53eS3AXHKSnPjIVH+9RPz7ZSEkGJ5kM
WxdDfLCgkCZIaV+7NOSISLOIvCqRxfxH42FZI/AA2W4At5J3U1j0pIAudHZTGHGLUG9C
i9GA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734330531; x=1734935331;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=kHrFnMpSHPELNBCjsgb8Cm4fGwJuXB32p4vdMwGhjtk=;
b=vUAP80T7DyMkjCA4CDs/Zv9RsnqIjk8Ngcfetxts9EVsRPJIucMTlH1UqJRX0FQZ/W
IraXfpwaHAN3ay0U4Zw3H5Jd8Vi0ogFIYKRoGyypfqpfMS2KuseaIFN1Ejm0gc/wXkxv
hy9dr688jktzBNIwqsORSz4TND/0NsWAFlKgH2peYxLz5kdhLiQaHTcc+LL+aS8SiqtT
mUcuR3Uj/DZQ8ZWoApR27Id05sJQwl1oLGs1hQN0HXBV8B5zUcbWssv5jiyzunYOsqfC
CQz7aQ7qnNuq/hiOfyj+Oyxgp4XVouJHaDFzVo0MfY5DRVFOqBPTiNBoasD/Agj1E88J
/34Q==
X-Gm-Message-State: AOJu0YzdkAXWYLFfTqDQiXWBNbEy1wk7qr5Xl3xwFoFLU/2BNcqUcgam
Eyniiqd7x9Je9BDltQ8rQwAP0Ponp2czslbHTOnLS2QDZNxFHHXcPz9rFQ==
X-Gm-Gg: ASbGnculSck75dt4OGyuUFqNRirHsyS/CzjdK8fAJert4jhJ4pg9RqVRVdxSO4TZ0KY
D7lRNThyomdIS9Z8vYN/g5IPGl00iBSnD/6pTImWIfKR1A/zErOoIFpEVXhHUEH3BM3jaHyUclI
RATwOpbZKJ3m+b96Pu/utX2a9UwUSRrkEzQDZ79Y6VgN3QoODoHmLNpdqO7l1KkjYCUcXa4GMHX
Rnsa4MUFwXjW5siRr+wpNv13BT+45jHGiJrEH+sDAN7s4SHXYk3uBiezQyYkpoL3uBjJEgTG0M=
X-Google-Smtp-Source: AGHT+IF05y9ktUeQZfI94KR4UNZL27/Q2n6BNUpXQipASNU6HSUyIcoX4xZuG/SN4SKQdDngXL0Nbw==
X-Received: by 2002:a05:6a00:2d07:b0:728:ecab:51e3 with SMTP id
d2e1a72fcca58-7290c1b0abdmr16104164b3a.11.1734330531126;
Sun, 15 Dec 2024 22:28:51 -0800 (PST)
Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-72918b788d1sm3948509b3a.110.2024.12.15.22.28.49
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 15 Dec 2024 22:28:50 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74909 <at> debbugs.gnu.org
Subject: [PATCH 2/3] build/guile: Disable parallel build for now.
Date: Mon, 16 Dec 2024 15:28:04 +0900
Message-ID: <d13269b557132bb136aa7c634c5995b1225fdf17.1734329084.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1734329084.git.maxim.cournoyer@HIDDEN>
References: <cover.1734329084.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74909
Cc: Maxim Cournoyer <maxim.cournoyer@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 (-)
Following discussions in bug #74204.
* guix/build-system/guile.scm (guile-build): Add a #:parallel-build? flag,
defaulting to #f for now.
(guile-cross-build): Likewise.
* guix/build/guile-build-system.scm (build): Honor it.
Change-Id: Ibf12ac098e9dcea83da7b9685796e501df606c6c
---
guix/build-system/guile.scm | 11 +++++++++++
guix/build/guile-build-system.scm | 6 +++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm
index ee59bb15f2..df6988a1b7 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -85,6 +85,10 @@ (define* (guile-build name inputs
(source-directory ".")
not-compiled-file-regexp
(scheme-file-regexp %scheme-file-regexp)
+ ;; FIXME: Turn on parallel building of Guile modules by
+ ;; default after the non-determinism issues in the Guile byte
+ ;; compiler are resolved (see bug #20272).
+ (parallel-build? #f)
(compile-flags %compile-flags)
(imported-modules %guile-build-system-modules)
(modules '((guix build guile-build-system)
@@ -101,6 +105,7 @@ (define* (guile-build name inputs
#:source-directory #$source-directory
#:scheme-file-regexp #$scheme-file-regexp
#:not-compiled-file-regexp #$not-compiled-file-regexp
+ #:parallel-build? #$parallel-build?
#:compile-flags #$compile-flags
#:phases #$phases
#:system #$system
@@ -132,6 +137,11 @@ (define* (guile-cross-build name
(source-directory ".")
(scheme-file-regexp %scheme-file-regexp)
not-compiled-file-regexp
+ ;; FIXME: Turn on parallel building of Guile
+ ;; modules by default after the non-determinism
+ ;; issues in the Guile byte compiler are resolved
+ ;; (see bug #20272).
+ (parallel-build? #f)
(compile-flags %compile-flags)
(imported-modules %guile-build-system-modules)
(modules '((guix build guile-build-system)
@@ -159,6 +169,7 @@ (define* (guile-cross-build name
#:source-directory #$source-directory
#:scheme-file-regexp #$scheme-file-regexp
#:not-compiled-file-regexp #$not-compiled-file-regexp
+ #:parallel-build? #$parallel-build?
#:compile-flags #$compile-flags
#:inputs %build-target-inputs
#:native-inputs %build-host-inputs
diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm
index 37a1654ce4..b497573c0a 100644
--- a/guix/build/guile-build-system.scm
+++ b/guix/build/guile-build-system.scm
@@ -145,6 +145,10 @@ (define* (report-build-progress total completed
(define* (build #:key outputs inputs native-inputs
(source-directory ".")
(compile-flags '())
+ ;; FIXME: Turn on parallel building of Guile modules by
+ ;; default after the non-determinism issues in the Guile byte
+ ;; compiler are resolved (see bug #20272).
+ (parallel-build? #f)
(scheme-file-regexp %scheme-file-regexp)
(not-compiled-file-regexp #f)
target
@@ -205,7 +209,7 @@ (define* (build #:key outputs inputs native-inputs
(string-append source-directory "/" file)
flags)))
source-files)
- #:max-processes (parallel-job-count)
+ #:max-processes (if parallel-build? (parallel-job-count) 1)
#:report-progress report-build-progress))))
(define* (install-documentation #:key outputs
--
2.46.0
maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#74909; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 16 Dec 2024 06:09:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Dec 16 01:09:59 2024 Received: from localhost ([127.0.0.1]:53178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tN4Ip-00044s-5p for submit <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:09:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:51072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tN4Ik-00044h-9Q for submit <at> debbugs.gnu.org; Mon, 16 Dec 2024 01:09:55 -0500 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 <maxim.cournoyer@HIDDEN>) id 1tN4Ge-00031W-Lx for guix-patches@HIDDEN; Mon, 16 Dec 2024 01:07:44 -0500 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tN4GX-0003iR-84 for guix-patches@HIDDEN; Mon, 16 Dec 2024 01:07:43 -0500 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-725ee6f56b4so3063446b3a.3 for <guix-patches@HIDDEN>; Sun, 15 Dec 2024 22:07:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734329254; x=1734934054; 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=AjB67qqISz7zhDF+qiMUzWufew70S9RU44aBU2G+l2Q=; b=hoOe06Cds11jb/Q5I2DMxvJpVp5gj6PCLBZyK/+C/uN7bg2qU3rcqO5NOEbTzEYqJ6 i8Fk4+xB2M+rA5j/51/g+v7uTNIjhW706zYKo/j+5CrmAM97Lyg/r51PljojO9SIoBNO dPEKSKmmWk6eQJJKgfBukPlqUP8ROl0P7Xk7ryUS2pUobZDOrMufXGSrOZDruEfnWgvC t1XFdCSWTCVDQbhvdmdJTA+RtP8eF3R6jX61vgnLD0Kipi9irl0DkxwTrg8frSb0HsBs 6CpN4b6x0FTPmg5CuiQMt4YYcJFp42MrrT6CFaA7TH4MZ3cy5TUXu4LNfg38XAxrxdrV DDRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734329254; x=1734934054; 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=AjB67qqISz7zhDF+qiMUzWufew70S9RU44aBU2G+l2Q=; b=amhDJ5oJeUWf5OUbPm0mHSFUDDRNuqxKky6a4aOu7ffhAiWAf5CBRINV7umHG4N/5P VnNonxC8GuSqTxLr5zdXEHOlAAzr03uYOmNXF9VVfJqfbgroer60pogJbDevSdnTIVT5 TWtsLSqAfTYFGSt+5IfpjWx54Qyo+l7Wabs2K196+tvOJwy3SvkdNiVZRC4zv0022eEk h8VCYoeBbs4sAxrUUU7lvBqz4uSr7QuG+s40v8CE1LgBIdT73HZmrOmxQTogzuPG2zGB gpMLs6vOoOsVbiX6Hg+ZiBdf/sl4n6ShqVdTxz8Od75rs6xvCzP6oobjmfgmBoFGt8fx 2OtA== X-Gm-Message-State: AOJu0Yz0TEscQ99NrHxCMrP6ku51Um9Qyat5UDZ4VoE/u0Cio5ty9SA/ l2eJH/OE2mwOF37g5QnpfnoEQru5nkeLzr3r2knMH/JKMvJrqhEMvdDYTQ== X-Gm-Gg: ASbGncuhG2xMjbAQODd2eyMvbjzWJ5w0SmZkOtvoXAz8Iv+BDdDWQT077eLC+mvRiSq 4lnoWGuSTM09+MCo4u+Zvfvj7gGhNoacNzW0FVWjXfbL77LYoU/S5AyEiIN1tK/AGTI945f2sbo 00zIk3fSyIpQtEvBkQJWf8sAnv2+MzPA2bG5cnsFw5AwKYjtGLQRh4V8IMI0u8RsA0yt7RCt8tt V2UIOgNmJVkn3Q7p/g73lIsnnljge5V35602h0mpxoByTnAG613cT7tMgPbGKt3WRABRd36Jno= X-Google-Smtp-Source: AGHT+IEEbZm4TsttkM0+QOFvm1+lTjIDJ2xh+Z1UdrGalRbuRprHuQ7jQ9i4gqkFuf7fV2p47RgIQg== X-Received: by 2002:a05:6a20:1588:b0:1e1:aa24:2e5c with SMTP id adf61e73a8af0-1e1dfe98d76mr13859282637.38.1734329253548; Sun, 15 Dec 2024 22:07:33 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918ac5280sm3916153b3a.35.2024.12.15.22.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 22:07:33 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/3] Make guile-build-system packages reproducible. Date: Mon, 16 Dec 2024 15:07:19 +0900 Message-ID: <cover.1734329084.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=maxim.cournoyer@HIDDEN; helo=mail-pf1-x432.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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer <maxim.cournoyer@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: -2.3 (--) This makes our guile-build-system packages reproducible, working around a defect in Guile that introduces non-determinism in the byte code depending off the order the files get loaded/byte-compiled (IIUC). Maxim Cournoyer (3): build/guile-build-system: Remove trailing #t in phases. build/guile: Disable parallel build for now. build/guile-build-system: Fix byte-compilation warnings. guix/build-system/guile.scm | 11 +++++++++++ guix/build/guile-build-system.scm | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) base-commit: 3a8e19a61d785ba651c63a3a5991a6e6dcfba9cb -- 2.46.0
Maxim Cournoyer <maxim.cournoyer@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#74909; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.