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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAAF5158083 for ; Fri, 13 Sep 2024 07:33:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 91149E29B7; Fri, 13 Sep 2024 07:33:25 +0000 (UTC) Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) (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 6EAEDE29AB for ; Fri, 13 Sep 2024 07:33:25 +0000 (UTC) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-6d5fccc3548so24476027b3.1 for ; Fri, 13 Sep 2024 00:33:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726212804; x=1726817604; darn=lists.gentoo.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=QfabcRhfXcvO5oUXiqyDCfYHeQPeZJnlLbChBfjVfC0=; b=kHdliChOZ4jamoTmhVJev9/gbhRhnEGuen9bZSZ8GcdVileYsF1fgyHIYUD2Z8Ps7W VrKLcLYsbc0YZZbwxIjNx5Bb8F9C8p6dfN5AeWsnfXHKE045lOHXKADOeSuP/Rfiw7/7 oeNpCDUcDRXBr+gmrgDLDT3o468gICiW3o7ynU9w2Zae4V6A24x5amKY/6Fr+e/yjWSj UpkST8LG58LDN9GDZOx7jrJc40oXTs9T7xu9bYno/SdecbGh/1FSwOs6RwhUIfUAOf5P wGcVzpoP73tIqkAZE0wLs3urT0uXi6kKCRiIZQE0oUXPcdSDup3FjGUs5tpcQHk111Mt 43aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726212804; x=1726817604; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QfabcRhfXcvO5oUXiqyDCfYHeQPeZJnlLbChBfjVfC0=; b=XiNMRs5hBsSENbIRSyT9QysDC95BdwtQsonERo2bQr38wKzfNwOMMdi4WOsJJTjodE qXprTWCn/7DjK5S93Isfz3OEZsYwvNezX6lvHSPvRrswkdW409j1pyAHxPxl7iaWt50i nI9vqaZEUsXNJb9DGb9n/VDAuZUm/v5+xNb3oWOkgQU/uhMx2Qim6LeEWKhZPo++1gqE 0nxfrFyyqcnwY0t6Qn4pbpCX/bgy82nxCpH1ceMB1+qaVaksD2oZvvPsFcWVe9SX0qyn mjPJ0Kg/LaCAIMTYYdcF/Fd9zO7/UyUVP8awryVjJrs1+2X2UxdT59fC+i/QqIlPa1/0 ZQTA== X-Gm-Message-State: AOJu0Yyt3rvCE2wZNq07/3qepnQKpj0aJAChBQreqM9Au1DT1eekpbxP DYGnA3Gi5roDxx3f1+kG2wTqihdo77azVjf2CRcK9vKUmPxpQl+cLXhP3kaDnrsLhFex6Oa23U+ Guu3Vck6DZftVlFjAWgcbcWf3o7f5dzoOnxD4+VneaK+5RVn0b3bUe2SRdo78IE/8j0mZUzl75H HWh83FDguZEczR2xHgH0nPg+Wk8s81uQdPktdB/hx6edfsJRKHtQ== X-Google-Smtp-Source: AGHT+IHZmSWISVaQanfxW019Sd2EbKFzplhN//Mnc6E+gl7RaTYh0pkc3BWJFwDAb295Hda20h7qeDiGOtcbSg== X-Received: from zhuyifei-kvm.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2edc]) (user=zhuyifei job=sendgmr) by 2002:a05:690c:630b:b0:6db:b3d9:751c with SMTP id 00721157ae682-6dbb7163930mr2304187b3.4.1726212804452; Fri, 13 Sep 2024 00:33:24 -0700 (PDT) Date: Fri, 13 Sep 2024 07:32:58 +0000 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 X-Mailer: git-send-email 2.46.0.662.g92d0881bb0-goog Message-ID: <20240913073258.588680-1-zhuyifei@google.com> Subject: [gentoo-dev] [PATCH] autotools.eclass: Run eautoheader with --force From: YiFei Zhu To: gentoo-dev@lists.gentoo.org Cc: YiFei Zhu Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: cd3facb8-a88a-4099-9b65-4d09a1ae9607 X-Archives-Hash: 6faff52b990cc68832a567e972eb79e4 From: YiFei Zhu 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 --- 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 -- 2.46.0.662.g92d0881bb0-goog