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 1BEE8158083 for ; Tue, 24 Sep 2024 11:52:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8DF9E2BA0; Tue, 24 Sep 2024 11:52:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 8E9C2E2BA0 for ; Tue, 24 Sep 2024 11:52:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 9724D343166 for ; Tue, 24 Sep 2024 11:52:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 926FF1ACF for ; Tue, 24 Sep 2024 11:52:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1727178680.5ff4a902b3706209c6fe148d9e3c621f6cc53ba4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/autotools.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5ff4a902b3706209c6fe148d9e3c621f6cc53ba4 X-VCS-Branch: master Date: Tue, 24 Sep 2024 11:52:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d2aaa500-6bbf-4fe6-a0f3-00c7b81172c5 X-Archives-Hash: 162272b738e6eb084a86bf0264eded80 commit: 5ff4a902b3706209c6fe148d9e3c621f6cc53ba4 Author: YiFei Zhu gmail com> AuthorDate: Fri Sep 13 04:38:04 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 24 11:51:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff4a902 autotools.eclass: Run eautoheader with --force To quote Eli [1] (I can't explain it better than this): autotools.eclass runs autoheader without options (and in particular without --force). This will only remake config.h.in if there are actual changes to the content, which in turn means that it will be out of date compared to aclocal.m4 (which we very much expect to have changes). So `make` sees that the header is out of date, and runs autoheader yet again, this time updating the timestamp for `make` purposes. This causes QA warning that "maintainer mode" is detected. autoheader and autoconf added --force option at the same time [2], so no reason only autoconf has that option in the eclass and not autoheader. Like, autoconf, a check on WANT_AUTOCONF != 2.1 is added because the feature was added in autoconf 2.52. [1] https://bugs.gentoo.org/939468#c6 [2] https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=dbf7fc61 Closes: https://bugs.gentoo.org/939468 Closes: https://bugs.gentoo.org/939535 Signed-off-by: YiFei Zhu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38588 Signed-off-by: Sam James gentoo.org> eclass/autotools.eclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 0571b18ba525..641612f37193 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -312,7 +312,13 @@ eautoreconf() { else eautoconf --force fi - [[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader + if [[ ${AT_NOEAUTOHEADER} != "yes" ]] ; then + if [[ ${WANT_AUTOCONF} == "2.1" ]] ; then + eautoheader + else + eautoheader --force + fi + fi [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then