From owner-p4-projects@FreeBSD.ORG  Thu Jun 13 19:21:32 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id C3FA3C83; Thu, 13 Jun 2013 19:21:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 84438C81
 for <perforce@freebsd.org>; Thu, 13 Jun 2013 19:21:32 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks6.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 749C51EEA
 for <perforce@freebsd.org>; Thu, 13 Jun 2013 19:21:32 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DJLWQR054938
 for <perforce@freebsd.org>; Thu, 13 Jun 2013 19:21:32 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5DJLWjV054935
 for perforce@freebsd.org; Thu, 13 Jun 2013 19:21:32 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 13 Jun 2013 19:21:32 GMT
Message-Id: <201306131921.r5DJLWjV054935@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 229677 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 13 Jun 2013 19:21:33 -0000

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

Change 229677 by brooks@brooks_zenith on 2013/06/13 19:20:44

	Manual merge of r251689:
	
	Be more agressive about bootstrapping ctfmerge and ctfconvert so
	builds from existing releases have a chance of working properly.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/Makefile.inc1#14 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#14 (text+ko) ====

@@ -1190,8 +1190,8 @@
 
 # dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
-    ((${BOOTSTRAPPING} < 800038 && \
-          !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
+    ((${BOOTSTRAPPING} < 1000034 && \
+          !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \
       || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge