From owner-svn-src-head@freebsd.org Tue Dec 1 05:22:12 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2496DA3E07C; Tue, 1 Dec 2015 05:22:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F403E1E93; Tue, 1 Dec 2015 05:22:11 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB15MBD4009641; Tue, 1 Dec 2015 05:22:11 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB15MAEI009636; Tue, 1 Dec 2015 05:22:10 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201512010522.tB15MAEI009636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 1 Dec 2015 05:22:10 +0000 (UTC) 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 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2015 05:22:12 -0000 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 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