From owner-svn-src-all@FreeBSD.ORG  Sat Aug 21 13:48:05 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 4503F106564A;
	Sat, 21 Aug 2010 13:48:05 +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 363108FC0A;
	Sat, 21 Aug 2010 13:48:05 +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 o7LDm5fW070983;
	Sat, 21 Aug 2010 13:48:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7LDm55c070981;
	Sat, 21 Aug 2010 13:48:05 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201008211348.o7LDm55c070981@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sat, 21 Aug 2010 13:48:05 +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: r211561 - head/cddl/lib/drti
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Aug 2010 13:48:05 -0000

Author: rpaulo
Date: Sat Aug 21 13:48:04 2010
New Revision: 211561
URL: http://svn.freebsd.org/changeset/base/211561

Log:
  Link drti.o with a PIC version of libelf. This is needed because
  drti.o depends on libelf and this avoids linking every other drti.o
  program (namely programs with USDT probes) with libelf.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/cddl/lib/drti/Makefile

Modified: head/cddl/lib/drti/Makefile
==============================================================================
--- head/cddl/lib/drti/Makefile	Sat Aug 21 13:42:12 2010	(r211560)
+++ head/cddl/lib/drti/Makefile	Sat Aug 21 13:48:04 2010	(r211561)
@@ -8,13 +8,20 @@ FILESOWN=	${LIBOWN}
 FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}/dtrace
-CLEANFILES=	${FILES}
+CLEANFILES=	${FILES} ${FILES}.tmp
 
 CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
-		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
+		-DPIC -fpic
+
+.c.o:
+	${CC} ${CFLAGS} -c ${.IMPSRC}
+	mv ${FILES} ${FILES}.tmp
+	${LD} -o ${FILES} -r ${FILES}.tmp ${LIBELF_PIC}
+	rm -f ${FILES}.tmp
 
 .include <bsd.prog.mk>