From patchwork Wed Oct 30 20:41:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RG/En2FuIMOHZcOnZW4=?= X-Patchwork-Id: 69713 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 312E527BBE9; Thu, 31 Oct 2024 18:28:29 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,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 207B927BBE2 for ; Thu, 31 Oct 2024 18:28:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6Ztt-0001cl-Re; Thu, 31 Oct 2024 14:28:05 -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 1t6Ztr-0001cX-Kg for guix-patches@gnu.org; Thu, 31 Oct 2024 14:28:03 -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 1t6Ztr-0002eF-5N for guix-patches@gnu.org; Thu, 31 Oct 2024 14:28:03 -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=9WqTP64pHNT55xWIpjpB/GSVBoQiiBlW49Op/jLlBJI=; b=ABxjaiLa+pM3jdP+FinfuQqCy1QC8xauIVziL3sOnHb+strdfuAf5TleNQik62MVr4zVzjCQeZGNDN4fOtFiiBBFn/4VLYWJO/M//T+mxDiIegQvAdM11/wR0wStdvry2m/MWRSSqawD834i6zI3icTEzN2n7FusldMOQsrgYwVyeUB7pLb8MB7l/R9GcvKFF4+mGkpwt/oT4E/nrWpNOnLBPQ+ApaCorxs3O3r12QJVyz4lRg4lsfbDnLNqOYr182ntMKJsiPdNN0huT8P8Ks7qRkUj4py4Ayw8KHpwwFS4OU0NAE9UHjH7nEBt0aNZeoP7ZqbSGcSjSVIFOqSrYg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6Ztq-0001yK-0f for guix-patches@gnu.org; Thu, 31 Oct 2024 14:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74141] [PATCH] daemon: Fix --with-libgcrypt-* args of the configure script Resent-From: =?utf-8?b?RG/En2FuIMOHZcOnZW4=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Oct 2024 18:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74141 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74141@debbugs.gnu.org Cc: =?utf-8?b?RG/En2FuIMOHZcOnZW4=?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17303992337553 (code B ref -1); Thu, 31 Oct 2024 18:28:01 +0000 Received: (at submit) by debbugs.gnu.org; 31 Oct 2024 18:27:13 +0000 Received: from localhost ([127.0.0.1]:43541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Zt2-0001xl-O8 for submit@debbugs.gnu.org; Thu, 31 Oct 2024 14:27:13 -0400 Received: from lists.gnu.org ([209.51.188.17]:38876) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Zt0-0001xZ-1N for submit@debbugs.gnu.org; Thu, 31 Oct 2024 14:27:11 -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 1t6Zsy-0001ac-IR for guix-patches@gnu.org; Thu, 31 Oct 2024 14:27:09 -0400 Received: from fout-a3-smtp.messagingengine.com ([103.168.172.146]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t6Zsw-0002ZB-Sh for guix-patches@gnu.org; Thu, 31 Oct 2024 14:27:08 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfout.phl.internal (Postfix) with ESMTP id D2A1C138043B; Thu, 31 Oct 2024 14:27:04 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-08.internal (MEProxy); Thu, 31 Oct 2024 14:27:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1730399224; x=1730485624; bh=9WqTP64pHNT55xWIpjpB/ GSVBoQiiBlW49Op/jLlBJI=; b=S4asv6HbqJrf7DjLVFGhSp7fPJKRxP010M+U/ z632ReNzLMJaPZl47KNN/2oQ2irHJXPuPri7U+atd6JJF2UI/YFGrUzhCvjgD3rT SWYyVGrVVltmwN//3uvbGfvEyeAurSGKtWwN541LMVLVfuxyBc69k+J0GRywxl9L 9oDExiWPFvg3BQqb1Df1Y8RXAVtpJQwIae0nQieYws0SdtHrJM/mJREDAKWKBKyi a28KfkYF2rNC68TRAk2XxT6bDvNl78BPbO5XJhLCvgP3PI/SXupUpjmp8/S6+OX+ eegftfzuh2ANT/Ai0rxKrnv4IVL0OcKZkqwYEb6gKgQt30RaA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1730399224; x=1730485624; bh=9WqTP64pHNT55xWIpjpB/GSVBoQiiBlW49O p/jLlBJI=; b=D4CLzM6K2u6VdAMM/Htfht7tJWzCtDMbsnavG+MbRoWODzXg9xU qDZPUszeaBXv1NOxm8U2SThWtULG0j59+inOwWoT0buxXzs0NmwEHkuMpRYoAZUw k+gtKbPVnf5b+ebXznlYlu+YxRE0lXnTJf2sK7EC9gRUkDvzH+t5NjjkzD+ibEyE W2VoR5CjVgFjiQIVsiJMuJl24M2JgDtMPRsny/gyxUpezQW6fwOOhP3kmxZ5j4At Xd7D+RLZoNPUCzVQLfssFRQLyYlXhhR9VErNrGsg/KxUPVgiHdtnRjYTIRQpZy9J Yd2fuLWBKb+41mp8/5+dUX0QywKHUm2qasw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrvdekjedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf ffkffoggfgsedtkeertdertdejnecuhfhrohhmpeffohhgrghnucmrvgopvghnuceoshgv phgvthhhsehfrghsthhmrghilhdrtghomheqnecuggftrfgrthhtvghrnhepgefgtefgff eklefhteekvdfgheevfefggfehvedvgffgueekhfdthffgffejhedvnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgvphgvthhhsehfrghsth hmrghilhdrtghomhdpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhr tghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdhrtghpthhtohepsh gvphgvthhhsehfrghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i57994943:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 31 Oct 2024 14:27:03 -0400 (EDT) From: =?utf-8?b?RG/En2FuIMOHZcOnZW4=?= Date: Wed, 30 Oct 2024 22:41:06 +0200 Message-ID: <79c05ec09291c176760e480e0f3e2f496d098777.1730320866.git.sepeth@fastmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=103.168.172.146; envelope-from=sepeth@fastmail.com; helo=fout-a3-smtp.messagingengine.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_12_24=1.049, 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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 This change fixes the LDFLAGS pointing to a previously nonexistent var (LIBGCRYPT_LDFLAGS). The name for this var was LIBGCRYPT_LIBS. Also, CFLAGS was not the correct destination since the checks were done with g++ and the env var for it is CXXFLAGS. Another issue was with the save_CFLAGS and save_LDFLAGS trick. While this is thoughtful, LDFLAGS and CXXFLAGS still need to be modified for `make` to find the correct lib. * config-daemon.ac: Fix LDFLAGS and CXXFLAGS for --with-libgcrypt-* args of the configure script. Change-Id: I0f3867491e46608e71b1ea0b3214674bca64b31d --- config-daemon.ac | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) base-commit: 6e50b0c56a8cc767bd3acb26638f78c450bde718 diff --git a/config-daemon.ac b/config-daemon.ac index 9854f1d694..1ac204ceed 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -39,28 +39,26 @@ if test "x$guix_build_daemon" = "xyes"; then case "$LIBGCRYPT_PREFIX" in no) - LIBGCRYPT_CFLAGS="" + LIBGCRYPT_CXXFLAGS="" ;; *) - LIBGCRYPT_CFLAGS="-I$LIBGCRYPT_PREFIX/include" + LIBGCRYPT_CXXFLAGS="-I$LIBGCRYPT_PREFIX/include" ;; esac case "$LIBGCRYPT_LIBDIR" in no | "") - LIBGCRYPT_LIBS="-lgcrypt" + LIBGCRYPT_LDFLAGS="-lgcrypt" ;; *) - LIBGCRYPT_LIBS="-L$LIBGCRYPT_LIBDIR -lgcrypt" + LIBGCRYPT_LDFLAGS="-L$LIBGCRYPT_LIBDIR -lgcrypt" ;; esac - AC_SUBST([LIBGCRYPT_CFLAGS]) - AC_SUBST([LIBGCRYPT_LIBS]) + AC_SUBST([LIBGCRYPT_CXXFLAGS]) + AC_SUBST([LIBGCRYPT_LDFLAGS]) - save_CFLAGS="$CFLAGS" - save_LDFLAGS="$LDFLAGS" - CFLAGS="$CFLAGS $LIBGCRYPT_CFLAGS" + CXXFLAGS="$CXXFLAGS $LIBGCRYPT_CXXFLAGS" LDFLAGS="$LDFLAGS $LIBGCRYPT_LDFLAGS" have_gcrypt=yes @@ -70,9 +68,6 @@ if test "x$guix_build_daemon" = "xyes"; then AC_MSG_ERROR([GNU libgcrypt not found; please install it.]) fi - CFLAGS="$save_CFLAGS" - LDFLAGS="$save_LDFLAGS" - dnl Chroot support. AC_CHECK_FUNCS([chroot unshare]) AC_CHECK_HEADERS([sched.h sys/param.h sys/mount.h sys/syscall.h])