From patchwork Wed May 21 15:49:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 42838 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 9A3F927BC49; Wed, 21 May 2025 16:50:41 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 D3FA927BC4A for ; Wed, 21 May 2025 16:50:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uHlhz-0003Qc-5y; Wed, 21 May 2025 11:50:19 -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 1uHlhp-0003KB-Pf for guix-patches@gnu.org; Wed, 21 May 2025 11:50:11 -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 1uHlhk-0007MC-Ae for guix-patches@gnu.org; Wed, 21 May 2025 11:50:07 -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=S57h/5ALA5JuwIV5bBojDDLkNx4HMk7lviexMhX8KdQ=; b=R5qgDKIIR0QEsDXmNOGmtKulL85KqJmbh4MCHAgE+VuDzHdMXRz9KWdsOhJDATTomO/TWf8gPVQtL91xiQhJtQp/bL8ZyIIlPiJoXBnkuYKbqAYTgg0B0Ls10h8mfEwS7iOjjYjVtKv+VjVPm3KU2U79T+RCo2CSeaP6ks7/wKOXz9IzOBDRTE9g6D2TQuyQWJtZ3fpwA0Vx2wOuDIcVkh+ubcYaTQvcOa8fn46d82loj2CEHsbHLJMQq7TbTrboqS52XptavDn93x4hFTcCpldcQKDFDOxnkEPUmxi6LzDjpUTVSZRJa8EDiw6HNiP6uF5Q+tlZCa+EM3aIA7IH5A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uHlhj-0008Vs-Lg for guix-patches@gnu.org; Wed, 21 May 2025 11:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78538] [PATCH] guix: gnu-dist: Fix distcheck. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 May 2025 15:50:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78538 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78538@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174784258232596 (code B ref -1); Wed, 21 May 2025 15:50:03 +0000 Received: (at submit) by debbugs.gnu.org; 21 May 2025 15:49:42 +0000 Received: from localhost ([127.0.0.1]:50687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uHlhM-0008TW-2G for submit@debbugs.gnu.org; Wed, 21 May 2025 11:49:41 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34990) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uHlhF-0008SV-CP for submit@debbugs.gnu.org; Wed, 21 May 2025 11:49: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 1uHlh6-00039Y-Tt for guix-patches@gnu.org; Wed, 21 May 2025 11:49:27 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uHlh4-0007GI-4D for guix-patches@gnu.org; Wed, 21 May 2025 11:49:24 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3a363ccac20so4414082f8f.2 for ; Wed, 21 May 2025 08:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747842558; x=1748447358; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=S57h/5ALA5JuwIV5bBojDDLkNx4HMk7lviexMhX8KdQ=; b=Y/isyuv9PvzxSJb53UmpuxDk3dQ4itH7WzWQirGul4XdcXYN4vy0vl+kFHFVnD7QgG 0JGgOXObhn4ek3QHdDdZOqT50EVs8VzYU+Db0lPKl7guBNdgbS28HhMKxh5LXbOnWASO AJnDGBuHCaDFrKN/URq7LTSLXqNyGP1hWlFHAhgkA1zC0tb3o7vlOTZLgTGzXFyfXv0Q acv6dVLiWllcqAv76FPcPXW6LpIL4CkhuIFuh4sscwEI74jQXOFL4p0I29XSkOa4cPfj i788jCpqPVMfkIkUwxsSuWoMvsWjL6hETQH6Ctbm0oEYe8QJYGJkcBcTM0rmHF/cdYGP Mt2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747842558; x=1748447358; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S57h/5ALA5JuwIV5bBojDDLkNx4HMk7lviexMhX8KdQ=; b=d7GbJX98ASF2m16rLFdyXtKoQuKauvEhhtR0K2eHFqqbvS5N7+r3xUgkL0HwYoomQH +Tp0MqmEZ9Xf5eXOyttMQgmsivRjVg8c3Utii6hG6obwyuvd12/D5mxzyybCNTIZ7AMI A/uNQMdgslBaoiNZpPgoeQi7g/wdKYvtKK7Umx2o4Z59KNce2fwkhc0wN/sgdT4p8vsa l8tbAZ9uTyZYTYI2jW6kOTKzOct02MLStxwmKdv6S1lSaJljngwI3jTe5iuWhBcELeV1 2ZV1YkjHwWxs87EelcByG8H2MGCWW2Jy4wDHXzFibwKCOV4OvdTRNvgX2Kyg/sT6o5bo Zp8w== X-Gm-Message-State: AOJu0Yz55JnW7B1aeQaMivXcHb5cZhtVMDBfDYk3dBrX/oXdl+b2aRM8 mulN6UtM8ZiYuBIII/1pZRSvxEHK+IL6sebhrpCc+iBX6gjJMQw8wPJQFU+QZBq4 X-Gm-Gg: ASbGncvnXcOYKy+cnAmBj35uPJ4grJQjrbCT9pj/n0jiqXkbPfJ0NJBJUlpUzq1g2r+ Xhq2H7NyRrE1EJYkiZH5YLhGrUaYJMze7zo1JXv9UPY0gP7Kgm4uQYcjbocaYdqNgd0kcClwEIb CBcbFZ9kcOvi9aw/Cs/l0uTycUgQdJHzSVENPg/6kbQ2iVE9Mr9uuP2+1wEWHFgdxmK7lWcYlQo 2JblPDUA9kDnHrouDVWoi6qtc6VPEyXz+SJCJko2ui/vsAEPSsLU9qZH4U9p5c2V9PpBi2dU52N 8kZ8inFfUHLLR9B2BOtQKXiQUsPszoi6Q3tpqHo+DnxPegi7D55/xOa0 X-Google-Smtp-Source: AGHT+IE4KDP3LNZmRMW+OZ1f7IGjSDvFmscKgcwrt+bW8t/XAazuqaexhW2y1eVTTf4fnR11TMSrDQ== X-Received: by 2002:a05:6000:178d:b0:3a3:762f:cbd0 with SMTP id ffacd0b85a97d-3a3762fccf3mr8982899f8f.52.1747842557588; Wed, 21 May 2025 08:49:17 -0700 (PDT) Received: from localhost ([141.226.12.183]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a35ca5a5b4sm19808336f8f.21.2025.05.21.08.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 May 2025 08:49:17 -0700 (PDT) From: Efraim Flashner Date: Wed, 21 May 2025 18:49:02 +0300 Message-ID: <1286006b2579e96659f14e0a0df8ca3ab89bdecb.1747835660.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=efraim.flashner@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=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-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: , 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 * guix/build/gnu-dist.scm (build): Add a configure-flag during the distcheck rebuild to use a shell we have in the build environment. Change-Id: I3519ab498ef47728729297a70ac1dce8e1b922ee --- guix/build/gnu-dist.scm | 3 +++ 1 file changed, 3 insertions(+) base-commit: 11bc17c409d77cd1af91e30b5b9f6a73f873a152 diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index cc48d3bdbff..59ac0012b80 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015, 2020, 2023 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2025 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,8 @@ (define* (build #:key build-before-dist? make-flags (dist-target "distcheck") (let ((build (assq-ref %standard-phases 'build))) (apply build args))) (format #t "building target `~a'~%" dist-target) + (setenv "DISTCHECK_CONFIGURE_FLAGS" + (string-append "SHELL=" (which "sh"))) (apply invoke "make" dist-target make-flags)) (define* (install-dist #:key outputs #:allow-other-keys)