From owner-svn-src-head@freebsd.org Mon Mar 23 21:21:42 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 36B6926FC5A; Mon, 23 Mar 2020 21:21:42 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mS4P6VCmz4h3p; Mon, 23 Mar 2020 21:21:41 +0000 (UTC) (envelope-from brooks@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E4001CB4F; Mon, 23 Mar 2020 21:21:40 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NLLdcZ053464; Mon, 23 Mar 2020 21:21:39 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NLLcES053455; Mon, 23 Mar 2020 21:21:38 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202003232121.02NLLcES053455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 23 Mar 2020 21:21:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359262 - in head: lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head: lib/kyua/cli lib/kyua/drivers lib/kyua/engine lib/kyua/model lib/kyua/store lib/kyua/utils share/mk X-SVN-Commit-Revision: 359262 X-SVN-Commit-Repository: base 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.29 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: Mon, 23 Mar 2020 21:21:42 -0000 Author: brooks Date: Mon Mar 23 21:21:38 2020 New Revision: 359262 URL: https://svnweb.freebsd.org/changeset/base/359262 Log: Improve LIBADD/_DP_* for kyua libraries. This fixes build with ld.bfd as the linker (e.g. on powerpc). This corrects a bug in D24103. Sponsored by: DARPA Modified: head/lib/kyua/cli/Makefile head/lib/kyua/drivers/Makefile head/lib/kyua/engine/Makefile head/lib/kyua/model/Makefile head/lib/kyua/store/Makefile head/lib/kyua/utils/Makefile head/share/mk/src.libnames.mk Modified: head/lib/kyua/cli/Makefile ============================================================================== --- head/lib/kyua/cli/Makefile Mon Mar 23 19:28:24 2020 (r359261) +++ head/lib/kyua/cli/Makefile Mon Mar 23 21:21:38 2020 (r359262) @@ -2,6 +2,7 @@ KYUA_LIB= cli INTERNALLIB= +LIBADD= kyua_drivers kyua_engine kyua_model kyua_store kyua_utils CFLAGS+= -DKYUA_CONFDIR=\"${KYUA_CONFDIR}\" \ -DKYUA_DOCDIR=\"${KYUA_CONFDIR}\" \ -DKYUA_MISCDIR=\"${KYUA_MISCDIR}\" \ Modified: head/lib/kyua/drivers/Makefile ============================================================================== --- head/lib/kyua/drivers/Makefile Mon Mar 23 19:28:24 2020 (r359261) +++ head/lib/kyua/drivers/Makefile Mon Mar 23 21:21:38 2020 (r359262) @@ -1,6 +1,7 @@ # $FreeBSD$ KYUA_LIB= drivers +LIBADD= kyua_model kyua_engine kyua_store SRCS= debug_test.cpp \ list_tests.cpp \ Modified: head/lib/kyua/engine/Makefile ============================================================================== --- head/lib/kyua/engine/Makefile Mon Mar 23 19:28:24 2020 (r359261) +++ head/lib/kyua/engine/Makefile Mon Mar 23 21:21:38 2020 (r359262) @@ -1,6 +1,7 @@ # $FreeBSD$ KYUA_LIB= engine +LIBADD= lutok kyua_utils CFLAGS= -DKYUA_ARCHITECTURE=\"${MACHINE_ARCH}\" \ -DKYUA_PLATFORM=\"${MACHINE}\" Modified: head/lib/kyua/model/Makefile ============================================================================== --- head/lib/kyua/model/Makefile Mon Mar 23 19:28:24 2020 (r359261) +++ head/lib/kyua/model/Makefile Mon Mar 23 21:21:38 2020 (r359262) @@ -1,6 +1,7 @@ # $FreeBSD$ KYUA_LIB= model +LIBADD= lutok SRCS= context.cpp \ exceptions.cpp \ Modified: head/lib/kyua/store/Makefile ============================================================================== --- head/lib/kyua/store/Makefile Mon Mar 23 19:28:24 2020 (r359261) +++ head/lib/kyua/store/Makefile Mon Mar 23 21:21:38 2020 (r359262) @@ -1,6 +1,7 @@ # $FreeBSD$ KYUA_LIB= store +LIBADD= kyua_model kyua_utils sqlite3 CFLAGS+= -DKYUA_STOREDIR=\"${KYUA_STOREDIR}\" Modified: head/lib/kyua/utils/Makefile ============================================================================== --- head/lib/kyua/utils/Makefile Mon Mar 23 19:28:24 2020 (r359261) +++ head/lib/kyua/utils/Makefile Mon Mar 23 21:21:38 2020 (r359262) @@ -1,6 +1,7 @@ # $FreeBSD$ KYUA_LIB= utils +LIBADD= lutok CFLAGS+= -I${SRCTOP}/contrib/sqlite3 CFLAGS+= -DGDB=\"/usr/local/bin/gdb\" Modified: head/share/mk/src.libnames.mk ============================================================================== --- head/share/mk/src.libnames.mk Mon Mar 23 19:28:24 2020 (r359261) +++ head/share/mk/src.libnames.mk Mon Mar 23 21:21:38 2020 (r359262) @@ -263,8 +263,12 @@ _DP_bsnmp= crypto _DP_geom= bsdxml sbuf _DP_cam= sbuf _DP_kvm= elf -_DP_kyua_cli= lutok kyua_utils -_DP_kyua_store= sqlite3 +_DP_kyua_cli= kyua_drivers kyua_engine kyua_model kyua_store kyua_utils +_DP_kyua_drivers= kyua_model kyua_engine kyua_store +_DP_kyua_engine= lutok kyua_utils +_DP_kyua_model= lutok +_DP_kyua_utils= lutok +_DP_kyua_store= kyua_model kyua_utils sqlite3 _DP_casper= nv _DP_cap_dns= nv _DP_cap_fileargs= nv