svn commit: r340146 - in head: lib usr.sbin
Kyle Evans
kevans at FreeBSD.org
Mon Nov 5 00:20:59 UTC 2018
Author: kevans
Date: Mon Nov 5 00:20:58 2018
New Revision: 340146
URL: https://svnweb.freebsd.org/changeset/base/340146
Log:
Move pmc* bits behind MK_PMC to fix WITHOUT_PMC build
No objection from: mmacy
MFC after: 3 days
Modified:
head/lib/Makefile
head/usr.sbin/Makefile
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Sun Nov 4 23:28:56 2018 (r340145)
+++ head/lib/Makefile Mon Nov 5 00:20:58 2018 (r340146)
@@ -70,8 +70,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libpathconv \
libpcap \
libpjdlog \
- libpmc \
- libpmcstat \
${_libproc} \
libprocstat \
libregex \
@@ -200,6 +198,7 @@ _libdl= libdl
.endif
SUBDIR.${MK_OPENSSL}+= libmp
+SUBDIR.${MK_PMC}+= libpmc libpmcstat
SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Sun Nov 4 23:28:56 2018 (r340145)
+++ head/usr.sbin/Makefile Mon Nov 5 00:20:58 2018 (r340146)
@@ -59,9 +59,6 @@ SUBDIR= adduser \
nologin \
pciconf \
periodic \
- pmcannotate \
- pmccontrol \
- pmcstat \
pnfsdscopymr \
pnfsdsfile \
pnfsdskill \
@@ -191,7 +188,7 @@ SUBDIR.${MK_PKGBOOTSTRAP}+= pkg
.if ${COMPILER_FEATURES:Mc++11}
SUBDIR.${MK_PMC}+= pmc
.endif
-SUBDIR.${MK_PMC}+= pmcstudy
+SUBDIR.${MK_PMC}+= pmcannotate pmccontrol pmcstat pmcstudy
SUBDIR.${MK_PORTSNAP}+= portsnap
SUBDIR.${MK_PPP}+= ppp
SUBDIR.${MK_QUOTAS}+= edquota
More information about the svn-src-all
mailing list