From patchwork Sun Nov 5 18:43:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 55959 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 2B72927BBEA; Sun, 5 Nov 2023 18:44:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 4CAEE27BBE2 for ; Sun, 5 Nov 2023 18:44:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzi6m-0006uh-ON; Sun, 05 Nov 2023 13:44:28 -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 ) id 1qzi6j-0006uX-W2 for guix-patches@gnu.org; Sun, 05 Nov 2023 13:44:26 -0500 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 1qzi6j-0003aN-O0 for guix-patches@gnu.org; Sun, 05 Nov 2023 13:44:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzi7K-0003VT-Bk for guix-patches@gnu.org; Sun, 05 Nov 2023 13:45:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66958] [PATCH] build: Require scripts/guix in pre-inst-env. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Nov 2023 18:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66958@debbugs.gnu.org Cc: Sergey Trofimov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169920987313423 (code B ref -1); Sun, 05 Nov 2023 18:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Nov 2023 18:44:33 +0000 Received: from localhost ([127.0.0.1]:38226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzi6r-0003UQ-3V for submit@debbugs.gnu.org; Sun, 05 Nov 2023 13:44:33 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzi6p-0003UE-Eg for submit@debbugs.gnu.org; Sun, 05 Nov 2023 13:44:32 -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 ) id 1qzi69-0006qO-8m for guix-patches@gnu.org; Sun, 05 Nov 2023 13:43:49 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzi66-0003X8-3b for guix-patches@gnu.org; Sun, 05 Nov 2023 13:43:48 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-52bd9ddb741so6186691a12.0 for ; Sun, 05 Nov 2023 10:43:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1699209823; x=1699814623; 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=ZKMeHTJx3RiiDRfiX80SrR0jxN9L2SsmPEuEFKdalLA=; b=JzTJrmLnLEk7snkS9tFZvPPy6tWMEUyPiYrSO71aYqZzTewcpoxjVN1aOFdJbFpUgg 1QvY7gWCKMv0Tpt5FKqIACPKCoXZRZm5wqhJqAdtNM/FQIGqYKUsjxukamW+Izz97mWO z+G6t5I/2JQEmpd1lxydz96EOIlbijoLV0tgk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699209823; x=1699814623; 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=ZKMeHTJx3RiiDRfiX80SrR0jxN9L2SsmPEuEFKdalLA=; b=F7RSOFByfZMJ/VrftJEwUT+VCxnFFA9VvxpX0jG5Bwy/yKc75H+czF66sfOtfdq5Z/ pBwnPDmhBHBIuEkcs+SsUBwSBkGitKDkQ4iE2LYIcdc/f1XdNoch2kcMTX+3ylEJvf5h dRqRDzEsLBzakOeYyqEYMZaNx29mmuix+PmV29QsG00nbGCTkEFPFodpNW1PjTWsjrhZ 05oVfWcsyb2KGT9YaGrLM4WwnxqqY/W8FYsszlL21KzvJXO3qQUHj4XDJEVSmEWmS6lz 4gJvGbLP1M1A07TiDmeDELwHfgqGdGv3V5fHHmnrmsZYNke//4zyMUO0FF1jEFL5q88E 8EyA== X-Gm-Message-State: AOJu0YzTilA+HZ9mDSW7b2YbCPc4FjQyVfZCqZ6KC7fP2Eu77OHLN1Zl Rx8SaAFQnB7W8g7qhSJPWOyRNjPoOAxU+HbxBGk= X-Google-Smtp-Source: AGHT+IHyIR+pk5ZdnNKDzRBaX9ojxmuzwa4322nM3i1IE5k4tNYF7HP4DgTkl/TrJkvcZGbClUe4qg== X-Received: by 2002:a17:907:7296:b0:9dd:ba33:cd39 with SMTP id dt22-20020a170907729600b009ddba33cd39mr4294315ejc.48.1699209822867; Sun, 05 Nov 2023 10:43:42 -0800 (PST) Received: from localhost ([77.64.253.43]) by smtp.gmail.com with ESMTPSA id j9-20020a17090643c900b0099b7276235esm3310482ejn.93.2023.11.05.10.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 10:43:42 -0800 (PST) From: Sergey Trofimov Date: Sun, 5 Nov 2023 19:43:34 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::52a; envelope-from=sarg@sarg.org.ru; helo=mail-ed1-x52a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 * Makefile.am: Make scripts/guix depend on local guile. * build-aux/pre-inst-env.in: Require scripts/guix. --- Makefile.am | 2 +- build-aux/pre-inst-env.in | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) base-commit: 286639c9af49dc56dce68a5483fd8ca3aeaecdb0 diff --git a/Makefile.am b/Makefile.am index c99f2f2911..d7f14b8962 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ do_subst = $(SED) \ -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \ -e 's,[@]localedir[@],$(localedir),g' -scripts/guix: scripts/guix.in Makefile +scripts/guix: scripts/guix.in Makefile guile$(EXEEXT) $(AM_V_at)rm -f $@ $@-t $(AM_V_at)$(MKDIR_P) "$(@D)" $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t" diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index cd90a06cbc..4063b46a4b 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -37,11 +37,18 @@ GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_ GUILE_LOAD_PATH="$abs_top_builddir:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH" export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH +CURRENT_GUIX=$(which guix) # Define $PATH so that `guix' and friends are easily found. PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH" export PATH +# sanity check +if [ "$CURRENT_GUIX" = "`which guix`" ]; then + echo "$abs_top_builddir/scripts/guix is not built. Please run make scripts/guix" + exit 1 +fi + # The daemon invokes 'guix'; tell it which one to use. GUIX="$abs_top_builddir/scripts/guix" export GUIX