From patchwork Sun Nov 19 13:34:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 56638 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 0D66E27BBE9; Sun, 19 Nov 2023 13:35:16 +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=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 437AB27BBE2 for ; Sun, 19 Nov 2023 13:35:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4hx1-0006qE-Bn; Sun, 19 Nov 2023 08:35:03 -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 1r4hwy-0006pq-Sf for guix-patches@gnu.org; Sun, 19 Nov 2023 08:35:01 -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 1r4hwy-0002Nk-KU for guix-patches@gnu.org; Sun, 19 Nov 2023 08:35:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4hwz-0006Vv-QL for guix-patches@gnu.org; Sun, 19 Nov 2023 08:35:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66958] [PATCH v1] build: Require scripts/guix in pre-inst-env. References: In-Reply-To: Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Nov 2023 13:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66958@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 66958-submit@debbugs.gnu.org id=B66958.170040086924989 (code B ref 66958); Sun, 19 Nov 2023 13:35:01 +0000 Received: (at 66958) by debbugs.gnu.org; 19 Nov 2023 13:34:29 +0000 Received: from localhost ([127.0.0.1]:50212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4hwS-0006Uz-HK for submit@debbugs.gnu.org; Sun, 19 Nov 2023 08:34:28 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:45379) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4hwP-0006Ui-3V for 66958@debbugs.gnu.org; Sun, 19 Nov 2023 08:34:27 -0500 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5437d60fb7aso5133057a12.3 for <66958@debbugs.gnu.org>; Sun, 19 Nov 2023 05:34:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1700400856; x=1701005656; darn=debbugs.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=7/umGG84GogVSx/49iVOkE9gcfgLZ7sHrm6pILSrH8I=; b=PBK2zpoM59en9d7ToDYcpXOlfx8JxJh/Sa4fqKZJwo9+ibOOj9hNCB2tmZrcJTrPaK TAZGvlIx4tsOoPjulFcSWYBlSgqgKHhe56PJq4aCv2B/2aQmjjOFtX2c7/5Y+4ohr1lu tx2RJ6zF82kH+tCpYHautJwS5bFOtQDs1CGx8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700400856; x=1701005656; 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=7/umGG84GogVSx/49iVOkE9gcfgLZ7sHrm6pILSrH8I=; b=k4BQ19/hmrbJJYA2NwaMJiZKO+J8YlJmtQwtKzFAAMKE5dX8K/5Xpiqhe/9/jZ+yTM ZffY/j6UZv4osRQBHdPGVik6Z6NaCtgyAoWBW2lERKW0UCTty/fopxXo0fgskHYCpXQ0 RxJ5KiGW9srSibu+agg137KlCrG/H4f/1/RzGSH/Wwl7FEZgBCHpfpz/4Rh/EuvaBGNt BUafBurSFCki7+tntw0x/2etyOXTBXbxK36yaz7Ksix7BPExVCIVxi7ZDHVMxM1wy1jo 5D3fP7pgsa+dBz30rQd61MOGBX1Gr5WOIaYNFcFxaFA5L9IzduNW1Th+uZ9zj22tPHcU u2qw== X-Gm-Message-State: AOJu0Yxze3/QAUVbEGJWZkw98Ugjd3ThKMfZwHWkPedENAG8JMxhBqMN Xi2BTHXcNxp6oVtsTn3smdlFD/guwInxsH0GCOUDOQ== X-Google-Smtp-Source: AGHT+IFfKQLwnwWe7KBOTf5A8KG5/l1pcf5Zoyhd4etdHPj/UkZtn0fGD8Vl/rItRN47BsSp4J/WCg== X-Received: by 2002:a17:906:15db:b0:9f8:2b44:7b7f with SMTP id l27-20020a17090615db00b009f82b447b7fmr4306204ejd.70.1700400856467; Sun, 19 Nov 2023 05:34:16 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id x6-20020a1709064bc600b009a193a5acffsm2865690ejv.121.2023.11.19.05.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Nov 2023 05:34:16 -0800 (PST) From: Sergey Trofimov Date: Sun, 19 Nov 2023 14:34:10 +0100 Message-ID: <5582e9962cde25dcbb66ee35527aff565a94795d.1700400821.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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 | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) base-commit: 761810d32a0550912b5bb36a0c9f60141bcb7d20 -- 2.41.0 diff --git a/Makefile.am b/Makefile.am index cbc3191dfc..34574c3a0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,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..7c1d5aa09b 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -46,6 +46,12 @@ export PATH GUIX="$abs_top_builddir/scripts/guix" export GUIX +# sanity check +if [ ! -f "$GUIX" ]; then + echo "$GUIX is not built. Please run make scripts/guix" + exit 1 +fi + # Define $GUIX_UNINSTALLED to prevent `guix' from # prepending @guilemoduledir@ to the Guile load paths.