From owner-svn-src-all@freebsd.org Wed Mar 25 01:34:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C753E2713A1; Wed, 25 Mar 2020 01:34:01 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48n9d53S8Dz45Gp; Wed, 25 Mar 2020 01:34:01 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C878EA2F7; Wed, 25 Mar 2020 01:32:17 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02P1WHVR068702; Wed, 25 Mar 2020 01:32:17 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02P1WHAs068698; Wed, 25 Mar 2020 01:32:17 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202003250132.02P1WHAs068698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 25 Mar 2020 01:32:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359292 - in head: lib/libpmc lib/libpmcstat usr.sbin/pmc usr.sbin/pmcstat X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in head: lib/libpmc lib/libpmcstat usr.sbin/pmc usr.sbin/pmcstat X-SVN-Commit-Revision: 359292 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 01:34:01 -0000 Author: manu Date: Wed Mar 25 01:32:16 2020 New Revision: 359292 URL: https://svnweb.freebsd.org/changeset/base/359292 Log: pmc: Add include path for libpmcstat as it is an internallib Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D24173 Modified: head/lib/libpmc/Makefile head/lib/libpmcstat/Makefile head/usr.sbin/pmc/Makefile head/usr.sbin/pmcstat/Makefile Modified: head/lib/libpmc/Makefile ============================================================================== --- head/lib/libpmc/Makefile Wed Mar 25 01:31:26 2020 (r359291) +++ head/lib/libpmc/Makefile Wed Mar 25 01:32:16 2020 (r359292) @@ -16,9 +16,10 @@ EVENT_ARCH="x86" EVENT_ARCH="powerpc" .endif +CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat + .if ${MK_DIRDEPS_BUILD} == "yes" # avoid circular dependency -CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat GENDIRDEPS_FILTER+= N${RELDIR:H}/libpmcstat JEVENTS?= ${HOST_OBJTOP}/${RELDIR}/pmu-events/jevents .else Modified: head/lib/libpmcstat/Makefile ============================================================================== --- head/lib/libpmcstat/Makefile Wed Mar 25 01:31:26 2020 (r359291) +++ head/lib/libpmcstat/Makefile Wed Mar 25 01:32:16 2020 (r359292) @@ -10,6 +10,8 @@ SRCS= \ libpmcstat_process.c \ libpmcstat_string.c \ libpmcstat_symbol.c -INCS= libpmcstat.h + +# If libpmcstat becomes public uncomment this line +#INCS= libpmcstat.h .include Modified: head/usr.sbin/pmc/Makefile ============================================================================== --- head/usr.sbin/pmc/Makefile Wed Mar 25 01:31:26 2020 (r359291) +++ head/usr.sbin/pmc/Makefile Wed Mar 25 01:32:16 2020 (r359292) @@ -9,6 +9,7 @@ WARNS?= 3 CXXFLAGS+= -O0 CXXSTD= c++14 CWARNFLAGS.gcc+= -Wno-redundant-decls +CFLAGS+= -I${SRCTOP}/lib/libpmcstat LIBADD= kvm pmc m ncursesw pmcstat elf Modified: head/usr.sbin/pmcstat/Makefile ============================================================================== --- head/usr.sbin/pmcstat/Makefile Wed Mar 25 01:31:26 2020 (r359291) +++ head/usr.sbin/pmcstat/Makefile Wed Mar 25 01:32:16 2020 (r359292) @@ -5,6 +5,7 @@ PROG_CXX= pmcstat MAN= pmcstat.8 +CFLAGS+= -I${SRCTOP}/lib/libpmcstat LIBADD= kvm pmc m ncursesw pmcstat elf SRCS= pmcstat.c pmcstat.h pmcstat_log.c \