From owner-svn-src-all@FreeBSD.ORG Fri Sep 10 16:27:10 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3470D106566B; Fri, 10 Sep 2010 16:27:10 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 24C2F8FC12; Fri, 10 Sep 2010 16:27:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8AGRAb0063530; Fri, 10 Sep 2010 16:27:10 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8AGRA8V063527; Fri, 10 Sep 2010 16:27:10 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201009101627.o8AGRA8V063527@svn.freebsd.org> From: Rui Paulo Date: Fri, 10 Sep 2010 16:27:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r212424 - head/share/mk X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 10 Sep 2010 16:27:10 -0000 Author: rpaulo Date: Fri Sep 10 16:27:09 2010 New Revision: 212424 URL: http://svn.freebsd.org/changeset/base/212424 Log: Add bsd.dtrace.mk. This allows userland programs and libraries to define USDT probes on a provider.d file and then use this new make infrastructure to build the corresponding header file and object file. This will only take effect when the user defines WITH_DTRACE when building. Sponsored by: The FreeBSD Foundation Added: head/share/mk/bsd.dtrace.mk (contents, props changed) Modified: head/share/mk/Makefile Modified: head/share/mk/Makefile ============================================================================== --- head/share/mk/Makefile Fri Sep 10 16:21:09 2010 (r212423) +++ head/share/mk/Makefile Fri Sep 10 16:27:09 2010 (r212424) @@ -3,7 +3,8 @@ FILES= bsd.README FILES+= bsd.arch.inc.mk -FILES+= bsd.compat.mk bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.endian.mk +FILES+= bsd.compat.mk bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.dtrace.mk +FILES+= bsd.endian.mk FILES+= bsd.files.mk bsd.incs.mk bsd.info.mk bsd.init.mk FILES+= bsd.kmod.mk FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk Added: head/share/mk/bsd.dtrace.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/mk/bsd.dtrace.mk Fri Sep 10 16:27:09 2010 (r212424) @@ -0,0 +1,55 @@ +# $FreeBSD$ +# +# Copyright (c) 2010 The FreeBSD Foundation +# All rights reserved. +# +# This software was developed by Rui Paulo under sponsorship from the +# FreeBSD Foundation. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# +# The only variable that you should define on your Makefile is 'DTRACEOBJS'. +# + +.if defined(WITH_DTRACE) + +CFLAGS+=-DWITH_DTRACE +DTRACEHEADERS=${DTRACEOBJS:S/o$/h/} +DTRACESRCS=${DTRACEOBJS:S/o$/d/} +CLEANFILES+=${DTRACEOBJS} ${DTRACEHEADERS} +.if defined(PROG) +_DTRACELINKING:=${OBJS} +OBJS+=${DTRACEOBJS} +.else +_DTRACELINKING:=${SOBJS} +SOBJS+=${DTRACEOBJS} +.endif +DPADD+=${LIBELF} +LDADD+=-lelf + +beforedepend: + ${DTRACE} -C -h -s ${DTRACESRCS} +beforelinking: + ${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING} + +.endif