From owner-svn-src-head@FreeBSD.ORG Thu Apr 9 21:38:43 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1631873A; Thu, 9 Apr 2015 21:38:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DB2EBF09; Thu, 9 Apr 2015 21:38:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39Lcg7J044839; Thu, 9 Apr 2015 21:38:42 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39Lcfpb044835; Thu, 9 Apr 2015 21:38:41 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201504092138.t39Lcfpb044835@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 9 Apr 2015 21:38:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281338 - in head: lib/libvmmapi share/mk usr.sbin/bhyve usr.sbin/bhyveload 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.18-1 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: Thu, 09 Apr 2015 21:38:43 -0000 Author: bapt Date: Thu Apr 9 21:38:40 2015 New Revision: 281338 URL: https://svnweb.freebsd.org/changeset/base/281338 Log: Fix overlinking in bhyve: libvmmapi is actually needed to be linked to libutil, not bhyve nor bhyveload Modified: head/lib/libvmmapi/Makefile head/share/mk/src.libnames.mk head/usr.sbin/bhyve/Makefile head/usr.sbin/bhyveload/Makefile Modified: head/lib/libvmmapi/Makefile ============================================================================== --- head/lib/libvmmapi/Makefile Thu Apr 9 21:35:44 2015 (r281337) +++ head/lib/libvmmapi/Makefile Thu Apr 9 21:38:40 2015 (r281338) @@ -6,6 +6,8 @@ INCS= vmmapi.h WARNS?= 2 +LIBADD= util + CFLAGS+= -I${.CURDIR} .include Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Thu Apr 9 21:35:44 2015 (r281337) +++ head/share/mk/src.libnames.mk Thu Apr 9 21:38:40 2015 (r281338) @@ -229,6 +229,7 @@ _DP_krb5+= asn1 com_err crypt crypto hx5 _DP_gssapi_krb5+= gssapi krb5 crypto roken asn1 com_err _DP_lzma= pthread _DP_ucl= m +_DP_vmmapi= util # Define spacial cases LDADD_supcplusplus= -lsupc++ Modified: head/usr.sbin/bhyve/Makefile ============================================================================== --- head/usr.sbin/bhyve/Makefile Thu Apr 9 21:35:44 2015 (r281337) +++ head/usr.sbin/bhyve/Makefile Thu Apr 9 21:38:40 2015 (r281338) @@ -43,7 +43,7 @@ SRCS= \ .PATH: ${.CURDIR}/../../sys/amd64/vmm SRCS+= vmm_instruction_emul.c -LIBADD= vmmapi md util pthread +LIBADD= vmmapi md pthread WARNS?= 2 Modified: head/usr.sbin/bhyveload/Makefile ============================================================================== --- head/usr.sbin/bhyveload/Makefile Thu Apr 9 21:35:44 2015 (r281337) +++ head/usr.sbin/bhyveload/Makefile Thu Apr 9 21:38:40 2015 (r281338) @@ -4,7 +4,7 @@ PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 -LIBADD= vmmapi util +LIBADD= vmmapi WARNS?= 3