From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 09A9F3858CD1; Tue, 19 Mar 2024 15:34:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09A9F3858CD1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1710862456; bh=zsd/F5Hggs4OUfipqC33i6LrFsLpq6DCvbgWASUMCGY=; h=From:To:Subject:Date:From; b=cmaCZMpb5MgAD/35aLqxk0pqE7bMbMd3bYqAmtM7O/0oooAdpHopyJeVu9TtPimA2 BNa710YEQINL1j3ekjXRljgM/WrDwkwkHsqfSAUeHME6I/eRbCjPQOL/rfwfirnCL/ T0TStCQsU9fA2sUdPnTlaBJutX0GsWT0cOd/Krcw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-9549] libstdc++: Regenerate in maintainer mode X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: d1b8c2237d7c6a2d52ea5a852a9a11ad426496f3 X-Git-Newrev: 90788dd722346560d410fe9a5c2d543811027336 Message-Id: <20240319153416.09A9F3858CD1@sourceware.org> Date: Tue, 19 Mar 2024 15:34:15 +0000 (GMT) List-Id: https://gcc.gnu.org/g:90788dd722346560d410fe9a5c2d543811027336 commit r14-9549-g90788dd722346560d410fe9a5c2d543811027336 Author: Jonathan Wakely Date: Fri Mar 1 11:20:51 2024 +0000 libstdc++: Regenerate in maintainer mode 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++. Diff: --- 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: diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 5a965c8e03b..9357087acb4 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1954,6 +1954,10 @@ update-version: cd ${bits_srcdir} && \ autogen version.def +# Regenerate it automatically in maintainer mode. +@MAINTAINER_MODE_TRUE@${bits_srcdir}/version.h: ${bits_srcdir}/version.def ${bits_srcdir}/version.tpl +@MAINTAINER_MODE_TRUE@ $(MAKE) update-version + # The real deal. install-data-local: install-headers install-headers: