Author: mmacy
Date: Fri Sep 14 01:11:10 2018
New Revision: 338676
URL: https://svnweb.freebsd.org/changeset/base/338676
Log:
re-enable pmcstat, pmccontrol, and pmcannotate for gcc4 builds
I had disabled building of the aforementioned targets due to warnings breaking
tinderbox. This silences the warning and restores them to the build.
Reported by: jhibbits
Reviewed by: jhibbits
Approved by: re (gjb)
Modified:
head/lib/Makefile
head/lib/libpmc/Makefile
head/usr.sbin/Makefile
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Thu Sep 13 23:59:59 2018 (r338675)
+++ head/lib/Makefile Fri Sep 14 01:11:10 2018 (r338676)
@@ -70,6 +70,8 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libpathconv \
libpcap \
libpjdlog \
+ libpmc \
+ libpmcstat \
${_libproc} \
libprocstat \
libregex \
@@ -198,9 +200,6 @@ _libdl= libdl
.endif
SUBDIR.${MK_OPENSSL}+= libmp
-.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" &&
${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv"))
-SUBDIR.${MK_PMC}+= libpmc libpmcstat
-.endif
SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet
Modified: head/lib/libpmc/Makefile
==============================================================================
--- head/lib/libpmc/Makefile Thu Sep 13 23:59:59 2018 (r338675)
+++ head/lib/libpmc/Makefile Fri Sep 14 01:11:10 2018 (r338676)
@@ -7,7 +7,7 @@ SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.
INCS= pmc.h pmclog.h pmcformat.h
CFLAGS+= -I${.CURDIR}
-CWARNFLAGS.gcc+= -Wno-shadow
+CWARNFLAGS.gcc+= -Wno-shadow -Wno-cast-align
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Thu Sep 13 23:59:59 2018 (r338675)
+++ head/usr.sbin/Makefile Fri Sep 14 01:11:10 2018 (r338676)
@@ -59,6 +59,9 @@ SUBDIR= adduser \
nologin \
pciconf \
periodic \
+ pmcannotate \
+ pmccontrol \
+ pmcstat \
pnfsdscopymr \
pnfsdsfile \
pnfsdskill \
@@ -185,11 +188,8 @@ SUBDIR.${MK_OPENSSL}+= keyserv
SUBDIR.${MK_PC_SYSINSTALL}+= pc-sysinstall
SUBDIR.${MK_PF}+= ftp-proxy
SUBDIR.${MK_PKGBOOTSTRAP}+= pkg
-.if (${COMPILER_TYPE} == "clang" || (${COMPILER_TYPE} == "gcc" &&
${COMPILER_VERSION} >= 60100 && ${MACHINE_CPUARCH} != "riscv"))
+.if ${COMPILER_FEATURES:Mc++11}
SUBDIR.${MK_PMC}+= pmc
-SUBDIR.${MK_PMC}+= pmcannotate
-SUBDIR.${MK_PMC}+= pmccontrol
-SUBDIR.${MK_PMC}+= pmcstat
.endif
SUBDIR.${MK_PMC}+= pmcstudy
SUBDIR.${MK_PORTSNAP}+= portsnap
_______________________________________________
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"
