Author: bdrewery
Date: Wed Dec 2 00:49:49 2015
New Revision: 291628
URL: https://svnweb.freebsd.org/changeset/base/291628
Log:
Reduce overlinking of libdtrace consumers with libctf, libelf, libproc.
The proper place for this list is _DP_dtrace.
Due to removing the LDADD_dtrace, more LIBADD are needed in
cddl/usr.sbin/dtrace to prevent underlinking.
This fixes overlinking in cddl/usr.sbin/lockstat and
cddl/usr.sbin/plockstat.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/cddl/usr.sbin/dtrace/Makefile
head/share/mk/src.libnames.mk
Modified: head/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/Makefile Wed Dec 2 00:49:45 2015
(r291627)
+++ head/cddl/usr.sbin/dtrace/Makefile Wed Dec 2 00:49:49 2015
(r291628)
@@ -22,7 +22,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
#CFLAGS+= -DNEED_ERRLOC
#YFLAGS+= -d
-LIBADD= dtrace
+LIBADD= dtrace ctf elf proc
.if ${MK_DTRACE_TESTS} != "no"
SUBDIR+= tests
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Wed Dec 2 00:49:45 2015
(r291627)
+++ head/share/mk/src.libnames.mk Wed Dec 2 00:49:49 2015
(r291628)
@@ -240,7 +240,7 @@ _DP_ucl= m
_DP_vmmapi= util
_DP_ctf= z
_DP_proc= rtld_db util
-_DP_dtrace= rtld_db pthread
+_DP_dtrace= ctf elf proc pthread rtld_db
_DP_xo= util
# Define spacial cases
@@ -284,9 +284,6 @@ LDADD_fifolog+= ${LDADD_z}
DPADD_ipf+= ${DPADD_kvm}
LDADD_ipf+= ${LDADD_kvm}
-DPADD_dtrace+= ${DPADD_ctf} ${DPADD_elf} ${DPADD_proc}
-LDADD_dtrace+= ${LDADD_ctf} ${LDADD_elf} ${LDADD_proc}
-
# The following depends on libraries which are using pthread
DPADD_hdb+= ${DPADD_pthread}
LDADD_hdb+= ${LDADD_pthread}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
