Module Name: src
Committed By: martin
Date: Fri Sep 25 10:08:35 UTC 2015
Modified Files:
src/external/bsd: Makefile
src/lib: Makefile
Log Message:
librtld_db depends on libproc, so conditionalize it as well
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/external/bsd/Makefile
cvs rdiff -u -r1.231 -r1.232 src/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.50 src/external/bsd/Makefile:1.51
--- src/external/bsd/Makefile:1.50 Fri Sep 25 08:22:02 2015
+++ src/external/bsd/Makefile Fri Sep 25 10:08:35 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.50 2015/09/25 08:22:02 martin Exp $
+# $NetBSD: Makefile,v 1.51 2015/09/25 10:08:35 martin Exp $
.include <bsd.own.mk>
SUBDIR= acpica am-utils bind byacc cron dhcpcd ekermit elftosb \
fetch file flex less \
- libarchive libevent liblzf libpcap librtld_db mdocml \
+ libarchive libevent liblzf libpcap mdocml \
ntp openresolv tcpdump tmux top tre wpa
.if (${MKATF} != "no")
@@ -37,6 +37,7 @@ SUBDIR+= pcc
.endif
.if (${MKDTRACE} != "no" || ${MKCTF} != "no")
SUBDIR+= libproc
+SUBDIR+= librtld_db
.endif
SUBDIR+= blacklist pdisk dhcp nvi ppp smbfs
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.231 src/lib/Makefile:1.232
--- src/lib/Makefile:1.231 Fri Sep 25 07:41:53 2015
+++ src/lib/Makefile Fri Sep 25 10:08:35 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.231 2015/09/25 07:41:53 martin Exp $
+# $NetBSD: Makefile,v 1.232 2015/09/25 10:08:35 martin Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -100,7 +100,9 @@ SUBDIR+= ../external/lgpl3/mpc/lib/libmp
#==================== 1st library dependency barrier ====================
SUBDIR+= .WAIT
+.if ${MKDTRACE} != "no" || ${MKCTF} != "no"
SUBDIR+= ../external/bsd/librtld_db/lib # depends on libutil
+.endif
.if ${MKDTRACE} != "no" || ${MKCTF} != "no"
SUBDIR+= ../external/cddl/osnet/lib/libctf
