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>
next in thread | previous in thread | raw e-mail | index | archive | help
On 28 Sep 2023, at 20:48, Jessica Clarke <jrtc27@FreeBSD.org> wrote: >=20 > On 26 Sep 2023, at 18:00, Ed Maste <emaste@FreeBSD.org> wrote: >>=20 >> The branch main has been updated by emaste: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D29a55fd09b0a3cc4c888f7a630fde416= 94699343 >>=20 >> 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 >>=20 >> dtc: Sync with upstream commit 26a0fe5 >>=20 >> - 0206c0f ("Handle top-level /delete-node/ directives.") >> - d612a9e ("Remove C++11 standard constrain") >> - Remove extra white lines after the $FreeBSD$ tag removal >>=20 >> 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(-) >>=20 >> 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 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D >>=20 >> 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=3Ddtc >> SRCS=3D dtc.cc input_buffer.cc string.cc dtb.cc fdt.cc checking.cc >> MAN=3D dtc.1 >> @@ -7,8 +6,6 @@ WARNS?=3D 3 >>=20 >> CXXFLAGS+=3D -fno-rtti -fno-exceptions >>=20 >> -CXXSTD=3D c++11 >=20 > 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. >=20 > (See = https://github.com/freebsd/freebsd-src/actions/runs/6341785142/job/1722617= 0311) In fact dtc now requires C++14 due to using auto in lambdas, and upstream=E2=80=99s build systems explicitly use C++17. Jess
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EAB450C0-E9C2-4A33-895B-679D6E07196E>