Page MenuHomeFreeBSD
Files F160962215

D23192.id68645.diff
No OneTemporary
Actions

D23192.id68645.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -2233,12 +2233,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
@@ -2360,7 +2354,7 @@
${_clang_tblgen} \
${_kerberos5_bootstrap_tools} \
${_strfile} \
- ${_dtc} \
+ usr.bin/dtc \
${_cat} \
${_kbdcontrol} \
${_elftoolchain_libs} \
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -26,6 +26,11 @@
disable the most expensive debugging functionality run
"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.
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
@@ -198,7 +198,6 @@
DTRACE_TESTS \
EXPERIMENTAL \
GNU_GREP_COMPAT \
- GPL_DTC \
HESIOD \
LIBSOFT \
LOADER_FIREWIRE \
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
@@ -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!
@@ -33,8 +31,4 @@
gnu/usr.bin/grep \
gnu/usr.bin/grep/doc \
-.if ${MK_GPL_DTC} != "no"
-DIRDEPS+= gnu/usr.bin/dtc
-.endif
-
.include <dirdeps.mk>
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
@@ -210,11 +210,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

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 30, 11:08 AM (2 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34498551
Default Alt Text
D23192.id68645.diff (3 KB)

Event Timeline