From owner-svn-src-all@FreeBSD.ORG  Mon Nov 28 15:09:31 2011
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 E1D5D1065673;
	Mon, 28 Nov 2011 15:09:31 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C31F68FC08;
	Mon, 28 Nov 2011 15:09:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pASF9VaK096494;
	Mon, 28 Nov 2011 15:09:31 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pASF9VYa096492;
	Mon, 28 Nov 2011 15:09:31 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201111281509.pASF9VYa096492@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 28 Nov 2011 15:09:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228073 - stable/9/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: Mon, 28 Nov 2011 15:09:32 -0000

Author: rwatson
Date: Mon Nov 28 15:09:31 2011
New Revision: 228073
URL: http://svn.freebsd.org/changeset/base/228073

Log:
  Merge r228057 from head to stable/9:
  
    Change the Makefile in cddl/lib/drti to use bsd.lib.mk instead of
    bsd.prog.mk -- we need to compile PIC, which requires a library build.
    With this change, USDT (userspace DTrace probes) work from within
    shared libraries.
  
    PR:             kern/159046
    Submitted by:   Alex Samorukov <samm at os2.kiev.ua>
    Comments by:    Scott Lystig Fritchie <slfritchie at snookles.com>
  
  Approved by:	re (xxx)

Modified:
  stable/9/cddl/lib/drti/Makefile
Directory Properties:
  stable/9/cddl/lib/drti/   (props changed)

Modified: stable/9/cddl/lib/drti/Makefile
==============================================================================
--- stable/9/cddl/lib/drti/Makefile	Mon Nov 28 14:58:51 2011	(r228072)
+++ stable/9/cddl/lib/drti/Makefile	Mon Nov 28 15:09:31 2011	(r228073)
@@ -18,4 +18,4 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-DPIC ${PICFLAG}
 
-.include <bsd.prog.mk>
+.include <bsd.lib.mk>