d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

META MODE: Fix userland/cddl.

Browse Source 
MK_CTF controls whether ctfmerge is ran against the binaries, not
whether CTF tools should be built.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
bdrewery 2015-12-01 05:22:10 +00:00
parent 01201993d3
commit 3ed6ae6012
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/usr.bin/ctfconvert/Makefile.depend
View File

@ -2,14 +2,12 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
cddl/lib/libctf \
gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdwarf \
lib/libelf \

2
cddl/usr.bin/ctfdump/Makefile.depend
View File

@ -8,10 +8,8 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libc_nonshared \
lib/libcompiler_rt \
lib/libelf \
lib/libthr \
lib/libz \

3
cddl/usr.bin/ctfmerge/Makefile.depend
View File

@ -2,16 +2,13 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
cddl/lib/libctf \
gnu/lib/csu \
gnu/lib/libgcc \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libc_nonshared \
lib/libcompiler_rt \
lib/libdwarf \
lib/libelf \
lib/libthr \
lib/libz \

3
cddl/usr.sbin/dtrace/Makefile.depend
View File

@ -10,7 +10,6 @@ DIRDEPS = \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libc_nonshared \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
@ -18,9 +17,7 @@ DIRDEPS = \
lib/librtld_db \
lib/libthr \
lib/libutil \
lib/liby \
lib/libz \
usr.bin/lex/lib \
.include <dirdeps.mk>

11
targets/pseudo/userland/cddl/Makefile.depend
View File

@ -9,19 +9,17 @@
DIRDEPS = \
cddl/lib/drti \
cddl/lib/libavl \
cddl/lib/libctf \
cddl/lib/libdtrace \
cddl/lib/libnvpair \
cddl/lib/libumem \
cddl/lib/libuutil \
DIRDEPS.CTF = \
cddl/lib/libctf \
cddl/usr.bin/ctfconvert \
cddl/usr.bin/ctfdump \
cddl/usr.bin/ctfmerge \
cddl/lib/libdtrace \
cddl/usr.sbin/dtrace \
cddl/usr.sbin/dtruss \
cddl/usr.sbin/lockstat \
DIRDEPS.ZFS = \
@ -33,12 +31,11 @@ DIRDEPS.ZFS = \
cddl/usr.bin/zinject \
cddl/usr.bin/zstreamdump \
cddl/usr.bin/ztest \
cddl/usr.sbin/lockstat \
cddl/usr.sbin/zdb \
cddl/usr.sbin/zhack \
.for O in CTF ZFS
.for O in ZFS
.if ${MK_$O} == "yes"
DIRDEPS+= ${DIRDEPS.$O}
.endif