From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 99ANHe2VdV9QfgAA0tVLHw (envelope-from ) for ; Thu, 01 Oct 2020 08:40:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id cN+cGO2VdV/kdAAAbx9fmQ (envelope-from ) for ; Thu, 01 Oct 2020 08:40:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0A5AD9404D1 for ; Thu, 1 Oct 2020 08:40:13 +0000 (UTC) Received: from localhost ([::1]:51492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNu8K-0008EV-24 for larch@yhetil.org; Thu, 01 Oct 2020 04:40:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNu8B-0008B8-Gy for guix-patches@gnu.org; Thu, 01 Oct 2020 04:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50679) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNu8B-0003bM-7H for guix-patches@gnu.org; Thu, 01 Oct 2020 04:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNu8B-0008Cp-5N for guix-patches@gnu.org; Thu, 01 Oct 2020 04:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43737] [PATCH 2/2] build: Use a 'guile' executable that doesn't warn about locales. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 08:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43737 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43737@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 43737-submit@debbugs.gnu.org id=B43737.160154154231432 (code B ref 43737); Thu, 01 Oct 2020 08:40:03 +0000 Received: (at 43737) by debbugs.gnu.org; 1 Oct 2020 08:39:02 +0000 Received: from localhost ([127.0.0.1]:33987 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNu7B-0008Al-OD for submit@debbugs.gnu.org; Thu, 01 Oct 2020 04:39:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNu79-0008AL-Tt for 43737@debbugs.gnu.org; Thu, 01 Oct 2020 04:39:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:50876) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNu74-0003So-Lm; Thu, 01 Oct 2020 04:38:54 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=33392 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kNu74-0000y1-60; Thu, 01 Oct 2020 04:38:54 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 1 Oct 2020 10:38:48 +0200 Message-Id: <20201001083848.27390-2-ludo@gnu.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001083848.27390-1-ludo@gnu.org> References: <20201001083848.27390-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 3.49 X-TUID: ev+KblCoDAqO This gets rid of: guile: warning: failed to install locale when running the 'guix' command on a foreign distro where 'GUIX_LOCPATH' isn't set. * Makefile.am (pkglibexec_PROGRAMS, guile_SOURCES, guile_LDADD) (guile_CFLAGS): New variables. (install-exec-hook): New target. (AUX_FILES): Remove 'guile-launcher.c'. * configure.ac: Use 'GUILE_FLAGS'. --- Makefile.am | 13 ++++++++++++- configure.ac | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index bc3efd2b6f..7aaf15cf8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,6 +47,18 @@ scripts/guix: scripts/guix.in Makefile $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t" $(AM_V_at)chmod a+x,a-w "$@-t" && mv -f "$@-t" "$@" +# This is our variant of the 'guile' executable, one that doesn't complain +# about locales. +pkglibexec_PROGRAMS = guile +guile_SOURCES = gnu/packages/aux-files/guile-launcher.c +guile_LDADD = $(GUILE_LIBS) +guile_CFLAGS = $(GUILE_CFLAGS) + +# Have the 'guix' command refer to our 'guile'. +install-exec-hook: + $(SED) -i "$(DESTDIR)$(bindir)/guix" \ + -e 's,^#![[:graph:]]\+,#!$(pkglibexecdir)/guile,g' + nodist_noinst_SCRIPTS = \ pre-inst-env \ test-env @@ -330,7 +342,6 @@ dist_noinst_DATA = \ # Auxiliary files for packages. AUX_FILES = \ - gnu/packages/aux-files/guile-launcher.c \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/linux-libre/5.8-arm.conf \ diff --git a/configure.ac b/configure.ac index adca374619..6861112eaf 100644 --- a/configure.ac +++ b/configure.ac @@ -105,6 +105,9 @@ if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3]) fi +dnl Get CFLAGS and LDFLAGS for libguile. +GUILE_FLAGS + dnl Installation directories for .scm and .go files. guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION" guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache" -- 2.28.0