From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 ED0073858CD1 for ; Tue, 19 Mar 2024 15:37:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ED0073858CD1 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 ED0073858CD1 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=1710862657; cv=none; b=r5wF8wmd5Ot5qim8Y3mHy54tIhLOO7BHUxmtrEQD0i78hTLcih/eeSALxao4HhIiNtwKWn+PKcefxBFlzS5Tsr924L/vxt38LBaAx5vtdZ99cQhLDC5qf4VScqYHSiKqpL1NyFAeBZ1o+kruIuysshX/vAdbHzGcXdbeNPZjxPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710862657; c=relaxed/simple; bh=8FnaGgGqLMn30ByviYPzi8IwTVsgqYpWdu5pG3h3M0A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=p+RuPLVPqIpZf/qdiCBoJWfL/FpBOu245mvKNrWO/Kio0Log066Hfplir5p9uEHgLW0Ov5k305hCjcqzXf6LGVCsRzz6RTTm6uE1o4Um+2gfwMjw3gVxnGYW+R7jbP76Ntg4Glz5fzS7UXUqrcYIFVJMrRpi+CD2CJCh6sMyHcE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710862655; 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=SpJoTqEWsF/whZuup07bunUcYvx+fr9GsvUwR9seIoRk9enelGhDlE4l07ovl6FHVWnKvA SV7Xwa1ckToPeKPPZKVTuW6AxjocBNgQqg63t5RW4CNW5SLGCAP2IkcxGZ4jLMNDCr1XQJ wTXRfMo3qmHvnfXXTygSMRLJwen8nRA= 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 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.8 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=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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: