Date: Thu, 28 Sep 2023 20:56:02 +0100 From: Jessica Clarke <jrtc27@freebsd.org> To: Ed Maste <emaste@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 29a55fd09b0a - main - dtc: Sync with upstream commit 26a0fe5 Message-ID: <EAB450C0-E9C2-4A33-895B-679D6E07196E@freebsd.org> In-Reply-To: <CAA8C638-1F3C-456B-B571-8FCB4BE7D232@freebsd.org> References: <202309261700.38QH06di038371@gitrepo.freebsd.org> <CAA8C638-1F3C-456B-B571-8FCB4BE7D232@freebsd.org>
index | next in thread | previous in thread | raw e-mail
On 28 Sep 2023, at 20:48, Jessica Clarke <jrtc27@FreeBSD.org> wrote: > > On 26 Sep 2023, at 18:00, Ed Maste <emaste@FreeBSD.org> wrote: >> >> The branch main has been updated by emaste: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=29a55fd09b0a3cc4c888f7a630fde41694699343 >> >> commit 29a55fd09b0a3cc4c888f7a630fde41694699343 >> Author: Jose Luis Duran <jlduran@gmail.com> >> AuthorDate: 2023-09-26 16:37:52 +0000 >> Commit: Ed Maste <emaste@FreeBSD.org> >> CommitDate: 2023-09-26 16:59:17 +0000 >> >> dtc: Sync with upstream commit 26a0fe5 >> >> - 0206c0f ("Handle top-level /delete-node/ directives.") >> - d612a9e ("Remove C++11 standard constrain") >> - Remove extra white lines after the $FreeBSD$ tag removal >> >> Reviewed by: kevans (earlier), theraven, emaste >> Differential Revision: https://reviews.freebsd.org/D41482 >> --- >> usr.bin/dtc/HACKING | 1 - >> usr.bin/dtc/Makefile | 3 -- >> usr.bin/dtc/fdt.cc | 134 ++++++++++++++++++++++++++++++++++++++++----------- >> usr.bin/dtc/fdt.hh | 24 ++++++--- >> 4 files changed, 121 insertions(+), 41 deletions(-) >> >> diff --git a/usr.bin/dtc/HACKING b/usr.bin/dtc/HACKING >> index 9447c4f6ebf9..ef858c8885c0 100644 >> --- a/usr.bin/dtc/HACKING >> +++ b/usr.bin/dtc/HACKING >> @@ -1,4 +1,3 @@ >> - >> Notes for people hacking on dtc >> =============================== >> >> diff --git a/usr.bin/dtc/Makefile b/usr.bin/dtc/Makefile >> index d242ed80e8b1..d7661ae164c3 100644 >> --- a/usr.bin/dtc/Makefile >> +++ b/usr.bin/dtc/Makefile >> @@ -1,4 +1,3 @@ >> - >> PROG_CXX=dtc >> SRCS= dtc.cc input_buffer.cc string.cc dtb.cc fdt.cc checking.cc >> MAN= dtc.1 >> @@ -7,8 +6,6 @@ WARNS?= 3 >> >> CXXFLAGS+= -fno-rtti -fno-exceptions >> >> -CXXSTD= c++11 > > This broke building FreeBSD on macOS, as it defaults to C++98 not > C++11, despite using modern Clang. Unlike CSTD there is no CXXSTD > default in bsd.sys.mk. Please reinstate this until we have a better way > to deal with CXXSTD. > > (See https://github.com/freebsd/freebsd-src/actions/runs/6341785142/job/17226170311) In fact dtc now requires C++14 due to using auto in lambdas, and upstream’s build systems explicitly use C++17. Jesshelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EAB450C0-E9C2-4A33-895B-679D6E07196E>