From patchwork Thu Feb 1 17:15:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 1894133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=JKOn3NTa; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQltj52dsz23g7 for ; Fri, 2 Feb 2024 04:16:28 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 959163857B9D for ; Thu, 1 Feb 2024 17:16:25 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 181E13858002 for ; Thu, 1 Feb 2024 17:15:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 181E13858002 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 181E13858002 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::32f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706807749; cv=none; b=V5qhBmrbXuovrjTyPFd0eujMGDjB9xiN7cKAH6QOKmcQrZ6SyF8oLndQ0epv0U01Jj4zzJlABsJth15zlmxMk/vTjBys0/wyhxQtE5fUXLLoPnfFReMcpqksDcDgiyiIHzd+SlABVXXbiri+f5cte1U2yFcJX1N43hSSza1WmNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706807749; c=relaxed/simple; bh=vNrOIfLk7GTqfOkqD9sBJoSMHOTOfdPBWhZNeo71MTk=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=MObfm3CEc24Bv/bkuemAXUdfNu/tFBMmdfjMXM1xR3ukAQxUGCf207jdmCkikZwb5oUbk8CGO+ivFlyEmaXqB0nvr0q7uTIB3c/RyCezKLJsl2F4XiQTfXqEUNbY2dSg3pYIT+f1no9DqP/lPIewBsZwhHYRTLGMkFSk4z9p5GI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ot1-x32f.google.com with SMTP id 46e09a7af769-6e146c132e0so1050857a34.1 for ; Thu, 01 Feb 2024 09:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706807745; x=1707412545; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6SwiDZT8T8mVnHeTNUH8wl5tnseM7oHZR0sTTnbTIgo=; b=JKOn3NTaOXEJnI9dG7REHlWybZW5AOZy0cku2y1YRYFuF0f3qFlpJIlNccBNMJdTPq /vSeICiLzQuh99oLlUm/VsJrUQmIJtEvgbWAlvdd3Lrt+0CTk5plM0bHEXYYAyFPmvEm vWgoIenE1MvZ7woMQzHnHVSuPvJr+DlbvNZo8sHSrdPAD8WZJJSMvn6H3CLqoPxErVVj U6VFO4SUZ36yUC8Ga6RUYwrWJG5ce1GohONCey3oGs8nalQWuHxr1MUHzHGHmfCCRTFM R2jYV/h2i9Tg+S1oSHgpOWpzH0UDRUoYwPG0Jhh5iSDztDEaEZrK+WbPJ5gc1FCCdaU4 sn+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706807745; x=1707412545; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6SwiDZT8T8mVnHeTNUH8wl5tnseM7oHZR0sTTnbTIgo=; b=ZQFoITxD5P4cqJ/onNs2hdo1DuXagK70AELAcD/HfOvmHWZVqEK4PUIjaEYEWnBNBT /rfrFxKAeb6qOKR67srFwf7QbVsruQ5REmykwB1DmbOw3I2qWaKkUwOLw9FRt2kmlcW2 MXMgQz3KQ1YLZBbVKUkf2SOrQfqSNHxsIdgg2kjFC/sPuDhopy22ZNqc17hmbSqq9kip JURJ7OWn16AWpBMuYX0VHRp2USyKW1yLbG0GwkclSFIyzgZk9KKAgqRP5wZ0yOPRwtEs OO38gqf3O9ziCMWT0h2oAWnfR+h+g45pr+TWL5hAzb1/ny/kMkCI45XHLlc3YORmtsFy 8d1A== X-Gm-Message-State: AOJu0YxUL4rhwFoTVkqRW28ktGQjJuwdfZywCUbfzqh/5DvMxjZ7rWiJ u3GOGkUbHuPIRdiyRLRc9WK0LeblOUt8dlJV5u4BDffG9O7L/1YcqqeNOpGWv90sZkZW1c+JocB sr40= X-Google-Smtp-Source: AGHT+IG8gSRWW+gaEynMeUL+0ucgcUVBlpZ1dn+QXgJqmbdUp5FNZ1+CS3glvqyYd5KhMhZXeQChZg== X-Received: by 2002:a05:6870:184a:b0:214:afeb:ea7f with SMTP id u10-20020a056870184a00b00214afebea7fmr2931473oaf.11.1706807745416; Thu, 01 Feb 2024 09:15:45 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXvEhVO9icguZpjEzcYJs5YC6wDTzu6AcwZh8QHiEsEjI/4U+XFJkAGGUPWSK7JcDX1j4PiXMZDhUSjtHwqrfnnSvfRAzs2mrFYpKoRl0dZFRFEb3Jduw== Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id nx13-20020a056870be8d00b002149bb5d09asm30123oab.56.2024.02.01.09.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 09:15:45 -0800 (PST) From: Christophe Lyon To: gcc-patches@gcc.gnu.org, oliva@adacore.com, josmyers@redhat.com Cc: Christophe Lyon Subject: [PATCH] gcc/configure: Re-introduce INSTALL_INFO Date: Thu, 1 Feb 2024 17:15:34 +0000 Message-Id: <20240201171534.424536-1-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org BUILD_INFO is currently a byproduct of checking makeinfo presence/version. INSTALL_INFO used to be defined similarly, but was removed in 2000 (!) by commit 17db658241d18cf6db59d31bc2d6eac96e9257df (svn r38141). In order to save build time, our CI overrides BUILD_INFO="", which works when invoking 'make all' but not for 'make install' in case some info files need an update. I noticed this when testing a patch posted on the gcc-patches list, leading to an error at 'make install' time after updating tm.texi (the build reported 'new text' in tm.texi and stopped). This is because 'install' depends on 'install-info', which depends on $(DESTDIR)$(infodir)/gccint.info (among others). This patch replaces the 'install-info' dependency in 'install' with $(INSTALL_INFO), thus enabling to skip this step. 2024-02-01 Christophe Lyon gcc/ * Makefile.in: Add INSTALL_INFO. * configure.ac: Add INSTALL_INFO. * configure: Regenerate. --- gcc/Makefile.in | 3 ++- gcc/configure | 3 +++ gcc/configure.ac | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 95caa54a52b..4d38b162307 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -817,6 +817,7 @@ INSTALL_HEADERS=install-headers install-mkheaders # Control whether Info documentation is built and installed. BUILD_INFO = @BUILD_INFO@ +INSTALL_INFO = @INSTALL_INFO@ # Control flags for @contents placement in HTML output MAKEINFO_TOC_INLINE_FLAG = @MAKEINFO_TOC_INLINE_FLAG@ @@ -3785,7 +3786,7 @@ maintainer-clean: # Install the driver last so that the window when things are # broken is small. install: install-common $(INSTALL_HEADERS) \ - install-cpp install-man install-info install-@POSUB@ \ + install-cpp install-man $(INSTALL_INFO) install-@POSUB@ \ install-driver install-lto-wrapper install-gcc-ar ifeq ($(enable_plugin),yes) diff --git a/gcc/configure b/gcc/configure index 4acb254d830..00f8c7ed6fb 100755 --- a/gcc/configure +++ b/gcc/configure @@ -826,6 +826,7 @@ FLEX GENERATED_MANPAGES MAKEINFO_TOC_INLINE_FLAG BUILD_INFO +INSTALL_INFO MAKEINFO have_mktemp_command make_compare_target @@ -8836,8 +8837,10 @@ $as_echo "$as_me: WARNING: *** Makeinfo is missing or too old. *** Info documentation will not be built." >&2;} BUILD_INFO= + INSTALL_INFO= else BUILD_INFO=info + INSTALL_INFO=install-info fi diff --git a/gcc/configure.ac b/gcc/configure.ac index d2ed14496c1..1041c2391fb 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1246,10 +1246,13 @@ if test $gcc_cv_prog_makeinfo_modern = no; then *** Makeinfo is missing or too old. *** Info documentation will not be built.]) BUILD_INFO= + INSTALL_INFO= else BUILD_INFO=info + INSTALL_INFO=install-info fi AC_SUBST(BUILD_INFO) +AC_SUBST(INSTALL_INFO) # Determine whether makeinfo supports the CONTENTS_OUTPUT_LOCATION variable. # If it does, we want to pass it to makeinfo in order to restore the old