From 134b378392a81b2a11b23fac073c306087a421ef Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 29 Feb 2020 17:10:54 +0000
Subject: retire in-tree GPL dtc devicetree compiler

Now that we no longer have GCC 4.2.1 in the tree and can assume FreeBSD
is being built with a C++11 compiler available, we can use BSDL dtc
unconditionally and retire the GPL dtc.

GPL dtc now has FreeBSD CI support via Cirrus-CI to help ensure it
continues to build/work on FreeBSD and is available in the ports tree
if needed.

The copy of (copyfree licensed) libfdt that we actually use is in
sys/contrib/libfdt so the extra copy under contrib/dtc/libfdt can be
removed along with the rest of the GPL dtc.

Reviewed by:	kevans, ian, imp, manu, theraven
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D23192
---
 gnu/usr.bin/Makefile            |  1 -
 gnu/usr.bin/dtc/Makefile        | 51 -----------------------------------------
 gnu/usr.bin/dtc/Makefile.depend | 18 ---------------
 3 files changed, 70 deletions(-)
 delete mode 100644 gnu/usr.bin/dtc/Makefile
 delete mode 100644 gnu/usr.bin/dtc/Makefile.depend

(limited to 'gnu/usr.bin')

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 98fffa9c08d69..c642b83a61db2 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -12,7 +12,6 @@ SUBDIR.${MK_GNU_DIFF}+=	diff3
 SUBDIR.${MK_GNU_GREP}+=	grep
 SUBDIR.${MK_GDB}+=	gdb
 SUBDIR_DEPEND_gdb=	binutils
-SUBDIR.${MK_GPL_DTC}+=	dtc
 SUBDIR.${MK_TESTS}+=	tests
 
 SUBDIR_PARALLEL=
diff --git a/gnu/usr.bin/dtc/Makefile b/gnu/usr.bin/dtc/Makefile
deleted file mode 100644
index d9fcc6404a917..0000000000000
--- a/gnu/usr.bin/dtc/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-DTCDIR=	${.CURDIR}/../../../contrib/dtc
-_LIBFDTDIR= ${.CURDIR}/../../../sys/contrib/libfdt
-.PATH: ${DTCDIR} ${_LIBFDTDIR}
-
-PROG=	dtc
-
-SRCS=	dtc.c checks.c fstree.c livetree.c treesource.c data.c \
-	flattree.c srcpos.c util.c \
-	fdt.c fdt_ro.c fdt_rw.c fdt_strerror.c \
-	fdt_sw.c fdt_wip.c ${DTCVERSIONFILE}
-
-WARNS?=	2
-CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${_LIBFDTDIR}
-
-VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' ${DTCDIR}/Makefile
-VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
-VERSIONSUB!= awk '/^SUBLEVEL =/ { print $$3 }' ${DTCDIR}/Makefile
-VERSIONEXTRA=
-
-DTCVERSION:=	${VERSIONMAJ}.${VERSIONMIN}.${VERSIONSUB}${VERSIONEXTRA}
-DTCVERSIONFILE:=	version_gen.h
-
-MAN=
-
-BISON=	yacc
-LEX=	lex
-
-OBJS+= dtc-parser.tab.o dtc-lexer.lex.o
-
-CLEANFILES+= dtc-parser.tab.o dtc-lexer.lex.o dtc-parser.tab.c \
-		dtc-parser.tab.h dtc-lexer.lex.c ${DTCVERSIONFILE}
-
-${DTCVERSIONFILE}: ${DTCDIR}/Makefile
-	@echo '#define DTC_VERSION "DTC ${DTCVERSION}"' > ${DTCVERSIONFILE}
-
-dtc-parser.tab.o:	dtc-parser.tab.c dtc-parser.tab.h
-dtc-lexer.lex.o:	dtc-lexer.lex.c dtc-parser.tab.h
-
-dtc-parser.tab.c:	dtc-parser.y
-	${BISON} -o$@ -d ${DTCDIR}/dtc-parser.y
-
-dtc-parser.tab.h:	dtc-parser.tab.c
-
-dtc-lexer.lex.c: dtc-lexer.l
-	${LEX} -o$@ ${DTCDIR}/dtc-lexer.l
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/dtc/Makefile.depend b/gnu/usr.bin/dtc/Makefile.depend
deleted file mode 100644
index d084433f911c3..0000000000000
--- a/gnu/usr.bin/dtc/Makefile.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	usr.bin/yacc.host \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
-- 
cgit v1.3