Date: Tue, 1 Dec 2015 05:22:10 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291562 - in head: cddl/usr.bin/ctfconvert cddl/usr.bin/ctfdump cddl/usr.bin/ctfmerge cddl/usr.sbin/dtrace targets/pseudo/userland/cddl Message-ID: <201512010522.tB15MAEI009636@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Dec 1 05:22:10 2015 New Revision: 291562 URL: https://svnweb.freebsd.org/changeset/base/291562 Log: META MODE: Fix userland/cddl. MK_CTF controls whether ctfmerge is ran against the binaries, not whether CTF tools should be built. Sponsored by: EMC / Isilon Storage Division Modified: head/cddl/usr.bin/ctfconvert/Makefile.depend head/cddl/usr.bin/ctfdump/Makefile.depend head/cddl/usr.bin/ctfmerge/Makefile.depend head/cddl/usr.sbin/dtrace/Makefile.depend head/targets/pseudo/userland/cddl/Makefile.depend Modified: head/cddl/usr.bin/ctfconvert/Makefile.depend ============================================================================== --- head/cddl/usr.bin/ctfconvert/Makefile.depend Tue Dec 1 05:19:02 2015 (r291561) +++ head/cddl/usr.bin/ctfconvert/Makefile.depend Tue Dec 1 05:22:10 2015 (r291562) @@ -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 \ Modified: head/cddl/usr.bin/ctfdump/Makefile.depend ============================================================================== --- head/cddl/usr.bin/ctfdump/Makefile.depend Tue Dec 1 05:19:02 2015 (r291561) +++ head/cddl/usr.bin/ctfdump/Makefile.depend Tue Dec 1 05:22:10 2015 (r291562) @@ -8,10 +8,8 @@ DIRDEPS = \ include/xlocale \ lib/${CSU_DIR} \ lib/libc \ - lib/libc_nonshared \ lib/libcompiler_rt \ lib/libelf \ - lib/libthr \ lib/libz \ Modified: head/cddl/usr.bin/ctfmerge/Makefile.depend ============================================================================== --- head/cddl/usr.bin/ctfmerge/Makefile.depend Tue Dec 1 05:19:02 2015 (r291561) +++ head/cddl/usr.bin/ctfmerge/Makefile.depend Tue Dec 1 05:22:10 2015 (r291562) @@ -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 \ Modified: head/cddl/usr.sbin/dtrace/Makefile.depend ============================================================================== --- head/cddl/usr.sbin/dtrace/Makefile.depend Tue Dec 1 05:19:02 2015 (r291561) +++ head/cddl/usr.sbin/dtrace/Makefile.depend Tue Dec 1 05:22:10 2015 (r291562) @@ -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> Modified: head/targets/pseudo/userland/cddl/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/cddl/Makefile.depend Tue Dec 1 05:19:02 2015 (r291561) +++ head/targets/pseudo/userland/cddl/Makefile.depend Tue Dec 1 05:22:10 2015 (r291562) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512010522.tB15MAEI009636>