From owner-freebsd-current@FreeBSD.ORG  Fri Dec 23 22:05:51 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0624106564A
	for <freebsd-current@freebsd.org>; Fri, 23 Dec 2011 22:05:51 +0000 (UTC)
	(envelope-from adrian.chadd@gmail.com)
Received: from mail-vx0-f182.google.com (mail-vx0-f182.google.com
	[209.85.220.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B2878FC14
	for <freebsd-current@freebsd.org>; Fri, 23 Dec 2011 22:05:51 +0000 (UTC)
Received: by vcbfk1 with SMTP id fk1so13399643vcb.13
	for <multiple recipients>; Fri, 23 Dec 2011 14:05:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=mime-version:sender:date:x-google-sender-auth:message-id:subject
	:from:to:cc:content-type;
	bh=5kbRfic3YPik8+lRwL6NAhcKMawSN6H6j7gdZq3XRvg=;
	b=IqHUQBaIA/6p1Fy4SPlA9yFFBZalyg1GvqS52Q2YNF5SraF28SfPCnumAszWYRWRpJ
	etGzPdrf4yqN4uS0UhBxBLJ00/QBA7U/RLkrDY23bTx8fzpIrTfgGcIzTUcoEm9LEwG+
	5fyFIuJ5o2FWTmTWdoypH/W0FGj411NAJNpXk=
MIME-Version: 1.0
Received: by 10.220.149.193 with SMTP id u1mr10075091vcv.33.1324677950618;
	Fri, 23 Dec 2011 14:05:50 -0800 (PST)
Sender: adrian.chadd@gmail.com
Received: by 10.52.36.5 with HTTP; Fri, 23 Dec 2011 14:05:50 -0800 (PST)
Date: Fri, 23 Dec 2011 14:05:50 -0800
X-Google-Sender-Auth: cYRyppF_HtoxpmOLnGLGtV5bZ4s
Message-ID: <CAJ-Vmok0a-QAV_p8Eoj6QvaovZCLZnHMMSSgTgEQDHnhaoVhqg@mail.gmail.com>
From: Adrian Chadd <adrian@freebsd.org>
To: freebsd-arch@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
Cc: freebsd-current <freebsd-current@freebsd.org>
Subject: [patch] allow local-tools to include local directories
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Dec 2011 22:05:51 -0000

Hi,

This patch allows for user-defined extra local tools directories, a la
what LOCAL_DIRS does for adding local build directories to the source.

This is needed for cross-compiling as some local tools may need to be
first built.

I've used this successfully to cross-compile my busybox stuff.

Thanks,


Adrian

--

[adrian@pcbsd-macvm] ~/work/freebsd/head/src> svn diff Makefile.inc1
Index: Makefile.inc1
===================================================================
--- Makefile.inc1       (revision 228757)
+++ Makefile.inc1       (working copy)
@@ -15,6 +15,8 @@
 #      -DNO_WWWUPDATE do not update www in ${MAKE} update
 #      -DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #      LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+#      LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
+#          list
 #      TARGET="machine" to crossbuild world for a different machine type
 #      TARGET_ARCH= may be required when a TARGET supports multiple endians

@@ -104,6 +106,8 @@
 CLEANDIR=      cleandir
 .endif

+LOCAL_TOOL_DIRS?=      ''
+
 CVS?=          cvs
 CVSFLAGS?=     -A -P -d -I!
 SVN?=          svn
@@ -1102,6 +1106,7 @@
     bin/csh \
     bin/sh \
     ${_rescue} \
+    ${LOCAL_TOOL_DIRS} \
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \