Page MenuHomeFreeBSD
Files F153943750

D3240.id7826.diff
No OneTemporary
Actions

D3240.id7826.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -1482,7 +1482,7 @@
.if ${MK_BINUTILS_BOOTSTRAP} != "no"
_binutils= gnu/usr.bin/binutils
.endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_CROSS_COMPILER} != "no"
_elftctools= lib/libelftc \
usr.bin/elfcopy \
usr.bin/nm \
@@ -1492,7 +1492,7 @@
# cross-build on a FreeBSD 10 host:
_elftctools+= usr.bin/addr2line
.endif
-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_CROSS_COMPILER} != "no"
# If cross-building with an external binutils we still need to build strip for
# the target (for at least crunchide).
_elftctools= lib/libelftc \
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -31,6 +31,11 @@
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150812:
+ The WITHOUT_ELFTOOLCHAIN_TOOLS src.conf(5) knob has been retired.
+ Control over building the ELF Tool Chain tools is now provided by
+ the WITHOUT_TOOLCHAIN knob.
+
20150809:
The default group assigned to /dev/dri entries has been changed
from 'wheel' to 'video' with the id of '44'. If you want to have
Index: gnu/usr.bin/binutils/Makefile
===================================================================
--- gnu/usr.bin/binutils/Makefile
+++ gnu/usr.bin/binutils/Makefile
@@ -12,7 +12,7 @@
${_objcopy} \
objdump \
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "no" || ${MK_ELFCOPY_AS_OBJCOPY} == "no"
+.if ${MK_ELFCOPY_AS_OBJCOPY} == "no"
_objcopy= objcopy
.endif
Index: lib/Makefile
===================================================================
--- lib/Makefile
+++ lib/Makefile
@@ -182,7 +182,7 @@
_cuse= libcuse
.endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_TOOLCHAIN} != "no"
_libelftc= libelftc
.endif
Index: targets/pseudo/toolchain/Makefile.depend
===================================================================
--- targets/pseudo/toolchain/Makefile.depend
+++ targets/pseudo/toolchain/Makefile.depend
@@ -9,7 +9,7 @@
.endif
DIRDEPS=
-.if ${MK_ELFTOOLCHAIN_TOOLS} == "yes"
+.if ${MK_TOOLCHAIN} == "yes"
DIRDEPS+= \
usr.bin/addr2line \
usr.bin/cxxflit \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -184,7 +184,7 @@
.if ${MK_BINUTILS} == no
OLD_FILES+=usr/bin/as
OLD_FILES+=usr/bin/ld
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
OLD_FILES+=usr/bin/objcopy
.endif
OLD_FILES+=usr/bin/objdump
@@ -203,7 +203,7 @@
OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
OLD_FILES+=usr/share/man/man1/as.1.gz
OLD_FILES+=usr/share/man/man1/ld.1.gz
-.if ${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} == no
+.if ${MK_ELFCOPY_AS_OBJCOPY} == no
OLD_FILES+=usr/share/man/man1/objcopy.1.gz
.endif
OLD_FILES+=usr/share/man/man1/objdump.1.gz
@@ -1647,29 +1647,6 @@
OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
.endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no || \
- (${MK_ELFTOOLCHAIN_TOOLS} != no && ${MK_ELFCOPY_AS_OBJCOPY} != no)
-OLD_FILES+=usr/bin/elfcopy
-OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
-.endif
-
-.if ${MK_ELFTOOLCHAIN_TOOLS} == no
-OLD_FILES+=usr/bin/addr2line
-OLD_FILES+=usr/bin/c++filt
-OLD_FILES+=usr/bin/nm
-OLD_FILES+=usr/bin/readelf
-OLD_FILES+=usr/bin/size
-OLD_FILES+=usr/bin/strings
-OLD_FILES+=usr/bin/strip
-OLD_FILES+=usr/share/man/man1/addr2line.1.gz
-OLD_FILES+=usr/share/man/man1/c++filt.1.gz
-OLD_FILES+=usr/share/man/man1/nm.1.gz
-OLD_FILES+=usr/share/man/man1/readelf.1.gz
-OLD_FILES+=usr/share/man/man1/size.1.gz
-OLD_FILES+=usr/share/man/man1/strings.1.gz
-OLD_FILES+=usr/share/man/man1/strip.1.gz
-.endif
-
#.if ${MK_EXAMPLES} == no
# to be filled in
#.endif
@@ -7529,8 +7506,25 @@
.endif
#.if ${MK_TOOLCHAIN} == no
-# to be filled in
+OLD_FILES+=usr/bin/addr2line
+OLD_FILES+=usr/bin/c++filt
+OLD_FILES+=usr/bin/nm
+OLD_FILES+=usr/bin/readelf
+OLD_FILES+=usr/bin/size
+OLD_FILES+=usr/bin/strings
+OLD_FILES+=usr/bin/strip
+OLD_FILES+=usr/share/man/man1/addr2line.1.gz
+OLD_FILES+=usr/share/man/man1/c++filt.1.gz
+OLD_FILES+=usr/share/man/man1/nm.1.gz
+OLD_FILES+=usr/share/man/man1/readelf.1.gz
+OLD_FILES+=usr/share/man/man1/size.1.gz
+OLD_FILES+=usr/share/man/man1/strings.1.gz
+OLD_FILES+=usr/share/man/man1/strip.1.gz
#.endif
+.if ${MK_TOOLCHAIN} == no || ${MK_ELFCOPY_AS_OBJCOPY} != no
+OLD_FILES+=usr/bin/elfcopy
+OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
+.endif
.if ${MK_UNBOUND} == no
OLD_FILES+=etc/rc.d/local_unbound
Index: tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
===================================================================
--- tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
+++ /dev/null
@@ -1,10 +0,0 @@
-.\" $FreeBSD$
-Set to avoid building ELF Tool Chain tools
-.Xr addr2line 1 ,
-.Xr c++filt 1 ,
-.Xr nm 1 ,
-.Xr readelf 1 ,
-.Xr size 1 ,
-.Xr strings 1 ,
-and
-.Xr strip 1 .
Index: usr.bin/Makefile
===================================================================
--- usr.bin/Makefile
+++ usr.bin/Makefile
@@ -218,16 +218,6 @@
SUBDIR+= ee
.endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
-SUBDIR+= addr2line
-SUBDIR+= cxxfilt
-SUBDIR+= elfcopy
-SUBDIR+= nm
-SUBDIR+= readelf
-SUBDIR+= size
-SUBDIR+= strings
-.endif
-
.if ${MK_FILE} != "no"
SUBDIR+= file
.endif
@@ -361,10 +351,13 @@
.endif
.if ${MK_TOOLCHAIN} != "no"
+SUBDIR+= addr2line
SUBDIR+= ar
SUBDIR+= c89
SUBDIR+= c99
SUBDIR+= ctags
+SUBDIR+= cxxfilt
+SUBDIR+= elfcopy
SUBDIR+= file2c
.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO gprof does not build
SUBDIR+= gprof
@@ -372,8 +365,12 @@
SUBDIR+= indent
SUBDIR+= lex
SUBDIR+= mkstr
+SUBDIR+= nm
+SUBDIR+= readelf
SUBDIR+= rpcgen
SUBDIR+= unifdef
+SUBDIR+= size
+SUBDIR+= strings
.if ${MACHINE_ARCH} != "aarch64" # ARM64TODO xlint does not build
SUBDIR+= xlint
.endif

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 26, 12:00 AM (14 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32149146
Default Alt Text
D3240.id7826.diff (5 KB)

Event Timeline