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
This commit is contained in:
parent
a9dfc956d6
commit
60648601bf
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=291628
@ -22,7 +22,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
|
|||||||
#CFLAGS+= -DNEED_ERRLOC
|
#CFLAGS+= -DNEED_ERRLOC
|
||||||
#YFLAGS+= -d
|
#YFLAGS+= -d
|
||||||
|
|
||||||
LIBADD= dtrace
|
LIBADD= dtrace ctf elf proc
|
||||||
|
|
||||||
.if ${MK_DTRACE_TESTS} != "no"
|
.if ${MK_DTRACE_TESTS} != "no"
|
||||||
SUBDIR+= tests
|
SUBDIR+= tests
|
||||||
|
@ -240,7 +240,7 @@ _DP_ucl= m
|
|||||||
_DP_vmmapi= util
|
_DP_vmmapi= util
|
||||||
_DP_ctf= z
|
_DP_ctf= z
|
||||||
_DP_proc= rtld_db util
|
_DP_proc= rtld_db util
|
||||||
_DP_dtrace= rtld_db pthread
|
_DP_dtrace= ctf elf proc pthread rtld_db
|
||||||
_DP_xo= util
|
_DP_xo= util
|
||||||
|
|
||||||
# Define spacial cases
|
# Define spacial cases
|
||||||
@ -284,9 +284,6 @@ LDADD_fifolog+= ${LDADD_z}
|
|||||||
DPADD_ipf+= ${DPADD_kvm}
|
DPADD_ipf+= ${DPADD_kvm}
|
||||||
LDADD_ipf+= ${LDADD_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
|
# The following depends on libraries which are using pthread
|
||||||
DPADD_hdb+= ${DPADD_pthread}
|
DPADD_hdb+= ${DPADD_pthread}
|
||||||
LDADD_hdb+= ${LDADD_pthread}
|
LDADD_hdb+= ${LDADD_pthread}
|
||||||
|
Loading…
Reference in New Issue
Block a user