From owner-svn-src-all@freebsd.org Sun Oct 18 07:30:52 2015 Return-Path: Delivered-To: svn-src-all@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 16C43A18497; Sun, 18 Oct 2015 07:30:52 +0000 (UTC) (envelope-from ngie@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 E4EACE0A; Sun, 18 Oct 2015 07:30:51 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9I7UpmU067070; Sun, 18 Oct 2015 07:30:51 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9I7Uoro067061; Sun, 18 Oct 2015 07:30:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201510180730.t9I7Uoro067061@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 18 Oct 2015 07:30:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289490 - in head: bin/ps lib/libxo lib/libxo/tests lib/libxo/tests/encoder sbin/savecore share/mk usr.bin/iscsictl usr.bin/wc usr.bin/xo X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Oct 2015 07:30:52 -0000 Author: ngie Date: Sun Oct 18 07:30:50 2015 New Revision: 289490 URL: https://svnweb.freebsd.org/changeset/base/289490 Log: Make libxo depend on libutil because it uses humanize_number after r287111 Remove overlinking in lib/libxo/tests, sbin/savecore, and usr.bin/{iscsictl,wc,xo} PR: 203673 Sponsored by: EMC / Isilon Storage Division Modified: head/bin/ps/Makefile head/lib/libxo/Makefile head/lib/libxo/tests/Makefile head/lib/libxo/tests/encoder/Makefile head/sbin/savecore/Makefile head/share/mk/src.libnames.mk head/usr.bin/iscsictl/Makefile head/usr.bin/wc/Makefile head/usr.bin/xo/Makefile Directory Properties: head/ (props changed) head/sbin/ (props changed) head/share/ (props changed) Modified: head/bin/ps/Makefile ============================================================================== --- head/bin/ps/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/bin/ps/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -11,6 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps # on large systems. # CFLAGS+=-DLAZY_PS -LIBADD= m kvm jail xo util +LIBADD= m kvm jail xo .include Modified: head/lib/libxo/Makefile ============================================================================== --- head/lib/libxo/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/lib/libxo/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -19,6 +19,8 @@ CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo INCS= xo.h xo_encoder.h INCSDIR=${INCLUDEDIR}/libxo +LIBADD= util + WARNS?= 5 MAN+= libxo.3 Modified: head/lib/libxo/tests/Makefile ============================================================================== --- head/lib/libxo/tests/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/lib/libxo/tests/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -242,8 +242,7 @@ PROGS+= test_11 CFLAGS+= -I${LIBXOSRC}/libxo -DPADD= ${LIBXO} ${LIBUTIL} -LDADD= -lxo -lutil +LIBADD= xo SUBDIR+= encoder Modified: head/lib/libxo/tests/encoder/Makefile ============================================================================== --- head/lib/libxo/tests/encoder/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/lib/libxo/tests/encoder/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -14,7 +14,6 @@ SRCS= enc_test.c CFLAGS+= -I${LIBXOSRC}/libxo -DPADD+= ${LIBXO} -LDADD+= -lxo +LIBADD= xo .include Modified: head/sbin/savecore/Makefile ============================================================================== --- head/sbin/savecore/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/sbin/savecore/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= savecore -LIBADD= z xo util +LIBADD= z xo MAN= savecore.8 .include Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Sun Oct 18 06:53:31 2015 (r289489) +++ head/share/mk/src.libnames.mk Sun Oct 18 07:30:50 2015 (r289490) @@ -239,6 +239,7 @@ _DP_vmmapi= util _DP_ctf= z _DP_proc= rtld_db util _DP_dtrace= rtld_db pthread +_DP_xo= util # Define spacial cases LDADD_supcplusplus= -lsupc++ Modified: head/usr.bin/iscsictl/Makefile ============================================================================== --- head/usr.bin/iscsictl/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/usr.bin/iscsictl/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -6,7 +6,7 @@ CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi MAN= iscsi.conf.5 iscsictl.8 -LIBADD= xo util +LIBADD= xo YFLAGS+= -v LFLAGS+= -i Modified: head/usr.bin/wc/Makefile ============================================================================== --- head/usr.bin/wc/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/usr.bin/wc/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -2,6 +2,6 @@ # $FreeBSD$ PROG= wc -LIBADD= xo util +LIBADD= xo .include Modified: head/usr.bin/xo/Makefile ============================================================================== --- head/usr.bin/xo/Makefile Sun Oct 18 06:53:31 2015 (r289489) +++ head/usr.bin/xo/Makefile Sun Oct 18 07:30:50 2015 (r289490) @@ -12,7 +12,7 @@ MAN= xo.1 # XXX For xoversion.h CFLAGS+=-I${LIBXOSRC}/libxo -LIBADD= xo util +LIBADD= xo .if ${MK_TESTS} != "no" SUBDIR+= tests