From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25E18158064 for ; Fri, 3 May 2024 06:42:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28583E2A5A; Fri, 3 May 2024 06:42:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB29EE2A56 for ; Fri, 3 May 2024 06:42:25 +0000 (UTC) From: Sam James To: gentoo-dev@lists.gentoo.org Cc: base-system@gentoo.org, Sam James Subject: [gentoo-dev] [PATCH 2/2] autotools.eclass: conditionalize gnuconfig dependency Date: Fri, 3 May 2024 07:42:06 +0100 Message-ID: <20240503064210.3200832-2-sam@gentoo.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240503064210.3200832-1-sam@gentoo.org> References: <20240503064210.3200832-1-sam@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: bf462884-4873-456f-be04-a86b734f78ba X-Archives-Hash: 8b8d1991ea7e7f00c4cb3bbaefda8d76 Use newly-added GNUCONFIG_DEPEND so that AUTOTOOLS_AUTO_DEPEND=no doesn't result in a useless dependency on gnuconfig. Signed-off-by: Sam James --- eclass/autotools.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 1ced771c5345f..a456e9b9f5898 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -33,6 +33,7 @@ _AUTOTOOLS_ECLASS=1 [[ ${EAPI} == 6 ]] && inherit eqawarn +GNUCONFIG_AUTO_DEPEND=no inherit gnuconfig libtool # @ECLASS_VARIABLE: WANT_AUTOCONF @@ -164,9 +165,12 @@ fi # @DESCRIPTION: # Contains the combination of requested automake/autoconf/libtool # versions in *DEPEND format. -AUTOTOOLS_DEPEND="${_automake_atom} +AUTOTOOLS_DEPEND=" + ${GNUCONFIG_DEPEND} + ${_automake_atom} ${_autoconf_atom} - ${_libtool_atom}" + ${_libtool_atom} +" RDEPEND="" # @ECLASS_VARIABLE: AUTOTOOLS_AUTO_DEPEND -- 2.45.0