From patchwork Tue Mar 19 15:35:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1913631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=e7KA8mnM; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; 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 [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4TzbTL2lMQz1yWn for ; Wed, 20 Mar 2024 02:37:58 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 53703385842B for ; Tue, 19 Mar 2024 15:37:56 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 1D2A63858D1E for ; Tue, 19 Mar 2024 15:37:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1D2A63858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1D2A63858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710862656; cv=none; b=l8Rd2O2fCM82f0eIbHOXeekxQF1Sg2lwGSWfU0i0MyxEVQ/L3eozgkltwsKY5HENSU/d2hVNaM2hMWX3ip9/pi0KWbuYoGffvkul0I6fM/w5hNvmptrZFArOq9WutNYXQa/Yw8tzVpi59pgacdb3+UcCLJffUEKG4LPDjfAytzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710862656; c=relaxed/simple; bh=8FnaGgGqLMn30ByviYPzi8IwTVsgqYpWdu5pG3h3M0A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=jwSzENNRbkQGrnWXtHtsQh5Hc+J3pFy5nDa8pG5TEZ0GqZPs0U4n4C6zlY1IAenIbrv/eyINRZPj+FVcbNVePL9Bxm9Wepq/TofRK4D4M9DAvn6pddm82SlWayo/Rthg/wx4/+vnRrl6E82mX5RSDrX46M1mZGWJQkJgSh2LLcU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710862654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xN3O/yJRMUodce4OP/HaflDYxsm/ELZiODLpEko8KCI=; b=e7KA8mnMbtc6Ho9m2adRHjG3O6xnlcaOP39RoVNLgECr7q7QWNkMSsHvCQjwxZHwuOW2OV oI7oHe8dulcMKG4icOWeNYtErmrp4cKv26yqD5iJbIqO0EyuFa/Zc8ydivSdWKZ+e6B0R9 ukpexieX0LflY7rj2hgA32aKcw4EdPE= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-673-xbYqp23cM8eWmHJian4H3w-1; Tue, 19 Mar 2024 11:37:33 -0400 X-MC-Unique: xbYqp23cM8eWmHJian4H3w-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 46A841C031B5; Tue, 19 Mar 2024 15:37:33 +0000 (UTC) Received: from localhost (unknown [10.42.28.8]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1353F40C6DB7; Tue, 19 Mar 2024 15:37:32 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Regenerate in maintainer mode Date: Tue, 19 Mar 2024 15:35:51 +0000 Message-ID: <20240319153712.3385723-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 Tested x86_64-linux. Pushed to trunk. I've taken the liberty of assuming that the change to gcc/doc/install.texi is sufficiently "obviously true" to not require separate approval. -- >8 -- This is a generated header but regenerating it requires the manual step of running 'make -C include update-version' in the libstdc++ build dir. Make it regenerate automatically when --enable-maintainer-mode is used. libstdc++-v3/ChangeLog: * include/Makefile.am [MAINTAINER_MODE]: Add target to automatically update . * include/Makefile.in: Regenerate. gcc/ChangeLog: * doc/install.texi (Prerequisites): Document use of autogen for libstdc++. --- gcc/doc/install.texi | 2 ++ libstdc++-v3/include/Makefile.am | 6 ++++++ libstdc++-v3/include/Makefile.in | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index e3650e0c4f4..014ca25aa62 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -545,6 +545,8 @@ Necessary to run @samp{make check} for @file{fixinc}. Necessary to regenerate the top level @file{Makefile.in} file from @file{Makefile.tpl} and @file{Makefile.def}. +Necessary to regenerate the @file{bits/version.h} header for libstdc++. + @item Flex version 2.5.4 (or later) Necessary when modifying @file{*.l} files. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 64152351ed0..cb902de36ae 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1480,6 +1480,12 @@ update-version: cd ${bits_srcdir} && \ autogen version.def +if MAINTAINER_MODE +# Regenerate it automatically in maintainer mode. +${bits_srcdir}/version.h: ${bits_srcdir}/version.def ${bits_srcdir}/version.tpl + $(MAKE) update-version +endif + # The real deal. install-data-local: install-headers install-headers: