d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce overlinking of libdtrace consumers with libctf, libelf, libproc.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2015-12-02 00:49:49 +00:00
parent a9dfc956d6
commit 60648601bf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=291628
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cddl/usr.sbin/dtrace/Makefile
View File

@ -22,7 +22,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
#CFLAGS+= -DNEED_ERRLOC
#YFLAGS+= -d
LIBADD= dtrace
LIBADD= dtrace ctf elf proc
.if ${MK_DTRACE_TESTS} != "no"
SUBDIR+= tests

5
share/mk/src.libnames.mk
View File

@ -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}