svn commit: r358468 - in head: . contrib/dtc gnu/usr.bin gnu/usr.bin/dtc share/mk targets/pseudo/userland targets/pseudo/userland/gnu tools/build/options usr.bin

Sat Feb 29 17:10:57 UTC 2020

Author: emaste
Date: Sat Feb 29 17:10:54 2020
New Revision: 358468
URL: https://svnweb.freebsd.org/changeset/base/358468

Log:
  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

Deleted:
  head/contrib/dtc/
  head/gnu/usr.bin/dtc/
  head/tools/build/options/WITHOUT_GPL_DTC
  head/tools/build/options/WITH_GPL_DTC
Modified:
  head/Makefile.inc1
  head/UPDATING
  head/gnu/usr.bin/Makefile
  head/share/mk/src.opts.mk
  head/targets/pseudo/userland/Makefile.depend
  head/targets/pseudo/userland/gnu/Makefile.depend
  head/usr.bin/Makefile

Modified: head/Makefile.inc1
==============================================================================

--- head/Makefile.inc1	Sat Feb 29 15:39:54 2020	(r358467)
+++ head/Makefile.inc1	Sat Feb 29 17:10:54 2020	(r358468)
@@ -2233,12 +2233,6 @@ ${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/lib
 ${_bt}-usr.bin/clang/lldb-tblgen: ${_bt}-lib/clang/libllvmminimal
 .endif
 
-# Build BSDL or GPL DTC depending on GPL_DTC option.
-_dtc= usr.bin/dtc
-.if ${MK_GPL_DTC} != "no"
-_dtc= gnu/usr.bin/dtc
-.endif
-
 .if ${MK_LOCALES} != "no"
 _localedef=	usr.bin/localedef
 .endif
@@ -2360,7 +2354,7 @@ bootstrap-tools: ${_bt}-links .PHONY
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
     ${_strfile} \
-    ${_dtc} \
+    usr.bin/dtc \
     ${_cat} \
     ${_kbdcontrol} \
     ${_elftoolchain_libs} \

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sat Feb 29 15:39:54 2020	(r358467)
+++ head/UPDATING	Sat Feb 29 17:10:54 2020	(r358468)
@@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
 20200229:
+	The WITH_GPL_DTC option has been removed.  The BSD-licenced device tree
+	compiler in usr.bin/dtc is used on all architectures which use dtc, and
+	the GPL dtc is available (if needed) from the sysutils/dtc port.
+
+20200229:
 	The WITHOUT_LLVM_LIBUNWIND option has been removed.  LLVM's libunwind
 	is used by all supported CPU architectures.
 

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Sat Feb 29 15:39:54 2020	(r358467)
+++ head/gnu/usr.bin/Makefile	Sat Feb 29 17:10:54 2020	(r358468)
@@ -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=

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sat Feb 29 15:39:54 2020	(r358467)
+++ head/share/mk/src.opts.mk	Sat Feb 29 17:10:54 2020	(r358468)
@@ -201,7 +201,6 @@ __DEFAULT_NO_OPTIONS = \
     DTRACE_TESTS \
     EXPERIMENTAL \
     GNU_GREP_COMPAT \
-    GPL_DTC \
     HESIOD \
     LIBSOFT \
     LOADER_FIREWIRE \

Modified: head/targets/pseudo/userland/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/Makefile.depend	Sat Feb 29 15:39:54 2020	(r358467)
+++ head/targets/pseudo/userland/Makefile.depend	Sat Feb 29 17:10:54 2020	(r358468)
@@ -188,6 +188,7 @@ DIRDEPS+= \
 	usr.bin/dirname \
 	usr.bin/dpv \
 	usr.bin/drill \
+	usr.bin/dtc \
 	usr.bin/du \
 	usr.bin/ee \
 	usr.bin/elf2aout \
@@ -853,10 +854,6 @@ DIRDEPS+= usr.sbin/cxgbetool
 
 .if ${MK_MLX5TOOL} != "no"
 DIRDEPS+= usr.sbin/mlx5tool
-.endif
-
-.if ${MK_GPL_DTC} != "yes"
-DIRDEPS+= usr.bin/dtc
 .endif
 
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}

Modified: head/targets/pseudo/userland/gnu/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/gnu/Makefile.depend	Sat Feb 29 15:39:54 2020	(r358467)
+++ head/targets/pseudo/userland/gnu/Makefile.depend	Sat Feb 29 17:10:54 2020	(r358468)
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
-.if !defined(MK_GPL_DTC)
 .include "${SRCTOP}/share/mk/src.opts.mk"
-.endif
 
 # This file is not autogenerated - take care!
 
@@ -32,9 +30,5 @@ DIRDEPS = \
 	gnu/usr.bin/gperf/doc \
 	gnu/usr.bin/grep \
 	gnu/usr.bin/grep/doc \
-
-.if ${MK_GPL_DTC} != "no"
-DIRDEPS+= gnu/usr.bin/dtc
-.endif
 
 .include <dirdeps.mk>

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Sat Feb 29 15:39:54 2020	(r358467)
+++ head/usr.bin/Makefile	Sat Feb 29 17:10:54 2020	(r358468)
@@ -210,10 +210,8 @@ SUBDIR.${MK_GAMES}+=	number
 SUBDIR.${MK_GAMES}+=	pom
 SUBDIR.${MK_GAMES}+=	primes
 SUBDIR.${MK_GAMES}+=	random
-.if ${MK_GPL_DTC} != "yes"
 .if ${COMPILER_FEATURES:Mc++11}
 SUBDIR+=	dtc
-.endif
 .endif
 SUBDIR.${MK_HESIOD}+=	hesinfo
 SUBDIR.${MK_ICONV}+=	iconv
