Index: Makefile.inc1 =================================================================== --- Makefile.inc1 +++ Makefile.inc1 @@ -2244,12 +2244,6 @@ ${_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 @@ -2374,7 +2368,7 @@ ${_kerberos5_bootstrap_tools} \ ${_strfile} \ ${_gperf} \ - ${_dtc} \ + usr.bin/dtc \ ${_cat} \ ${_kbdcontrol} \ ${_elftoolchain_libs} \ Index: gnu/usr.bin/Makefile =================================================================== --- gnu/usr.bin/Makefile +++ gnu/usr.bin/Makefile @@ -12,7 +12,6 @@ SUBDIR.${MK_GNU_GREP}+= grep SUBDIR.${MK_GDB}+= gdb SUBDIR_DEPEND_gdb= binutils -SUBDIR.${MK_GPL_DTC}+= dtc SUBDIR.${MK_TESTS}+= tests SUBDIR_PARALLEL= Index: share/mk/src.opts.mk =================================================================== --- share/mk/src.opts.mk +++ share/mk/src.opts.mk @@ -200,7 +200,6 @@ DTRACE_TESTS \ EXPERIMENTAL \ GNU_GREP_COMPAT \ - GPL_DTC \ HESIOD \ HTTPD \ LIBSOFT \ Index: targets/pseudo/userland/Makefile.depend =================================================================== --- targets/pseudo/userland/Makefile.depend +++ targets/pseudo/userland/Makefile.depend @@ -188,6 +188,7 @@ usr.bin/dirname \ usr.bin/dpv \ usr.bin/drill \ + usr.bin/dtc \ usr.bin/du \ usr.bin/ee \ usr.bin/elf2aout \ @@ -855,10 +856,6 @@ DIRDEPS+= usr.sbin/mlx5tool .endif -.if ${MK_GPL_DTC} != "yes" -DIRDEPS+= usr.bin/dtc -.endif - DIRDEPS+= ${DIRDEPS.${MACHINE}:U} Index: targets/pseudo/userland/gnu/Makefile.depend =================================================================== --- targets/pseudo/userland/gnu/Makefile.depend +++ targets/pseudo/userland/gnu/Makefile.depend @@ -34,8 +34,4 @@ gnu/usr.bin/grep \ gnu/usr.bin/grep/doc \ -.if ${MK_GPL_DTC} != "no" -DIRDEPS+= gnu/usr.bin/dtc -.endif - .include Index: tools/build/options/WITHOUT_GPL_DTC =================================================================== --- tools/build/options/WITHOUT_GPL_DTC +++ /dev/null @@ -1,3 +0,0 @@ -.\" $FreeBSD$ -Set to build the BSD licensed version of the device tree compiler rather -than the GPLed one from elinux.org. Index: tools/build/options/WITH_GPL_DTC =================================================================== --- tools/build/options/WITH_GPL_DTC +++ /dev/null @@ -1,3 +0,0 @@ -.\" $FreeBSD$ -Set to build the GPL'd version of the device tree compiler from elinux.org, -instead of the BSD licensed one. Index: usr.bin/Makefile =================================================================== --- usr.bin/Makefile +++ usr.bin/Makefile @@ -211,11 +211,9 @@ 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 SUBDIR.${MK_ICONV}+= mkcsmapper