Date: Mon, 23 Mar 2020 21:21:38 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> 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 Message-ID: <202003232121.02NLLcES053455@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003232121.02NLLcES053455>