From owner-p4-projects@FreeBSD.ORG  Sat Jul  7 16:11:56 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 289231065673; Sat,  7 Jul 2012 16:11:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF7FD106564A
	for <perforce@freebsd.org>; Sat,  7 Jul 2012 16:11:55 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C77238FC0A
	for <perforce@freebsd.org>; Sat,  7 Jul 2012 16:11:55 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q67GBtul025860
	for <perforce@freebsd.org>; Sat, 7 Jul 2012 16:11:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q67GBtMV025857
	for perforce@freebsd.org; Sat, 7 Jul 2012 16:11:55 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 7 Jul 2012 16:11:55 GMT
Message-Id: <201207071611.q67GBtMV025857@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 214035 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jul 2012 16:11:56 -0000

http://p4web.freebsd.org/@@214035?ac=10

Change 214035 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/07/07 16:11:03

	Integerate CheriBSD branch to pick up the libvuln_magic build
	fix from FreeBSD/BERI.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#2 integrate

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#2 (text+ko) ====

@@ -4,6 +4,7 @@
 .include <bsd.own.mk>
 
 SUBDIR=	libde4tc \
+	libvuln_magic \
 	libvuln_png
 
 .include <bsd.subdir.mk>