From owner-freebsd-current@FreeBSD.ORG Sun Jan 1 12:58:25 2012 Return-Path: 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 D0E8B106566C; Sun, 1 Jan 2012 12:58:25 +0000 (UTC) (envelope-from ray@ddteam.net) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3E9468FC14; Sun, 1 Jan 2012 12:58:25 +0000 (UTC) Received: by eekc50 with SMTP id c50so17626866eek.13 for ; Sun, 01 Jan 2012 04:58:24 -0800 (PST) Received: by 10.213.3.214 with SMTP id 22mr98793ebo.2.1325421144933; Sun, 01 Jan 2012 04:32:24 -0800 (PST) Received: from rnote.ddteam.net (170-249-133-95.pool.ukrtel.net. [95.133.249.170]) by mx.google.com with ESMTPS id q67sm114529129eea.8.2012.01.01.04.32.22 (version=SSLv3 cipher=OTHER); Sun, 01 Jan 2012 04:32:23 -0800 (PST) Date: Sun, 1 Jan 2012 14:32:18 +0200 From: Aleksandr Rybalko To: Adrian Chadd Message-Id: <20120101143218.7a42f001.ray@ddteam.net> In-Reply-To: References: X-Mailer: Sylpheed 3.1.2 (GTK+ 2.24.5; amd64-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: freebsd-current , freebsd-arch@freebsd.org Subject: Re: [patch] bsdbox changes for base system: add LOCAL_ X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jan 2012 12:58:25 -0000 On Fri, 23 Dec 2011 16:42:06 -0800 Adrian Chadd wrote: > Hi, > > Here are two patches which implement some useful features for crunch > building: > > * Add LOCAL_TOOLS_DIR in src/Makefile.inc1, which adds entries to the > 'build-tools' target. This is needed for cross-building bsdbox (and > any external directory added by LOCAL_DIRS) That makes me happy :) > * If CRUNCH_SUPPRESS_ALL_LINKS is set to 'yes', don't auto-populate > the crunch-gen hard links. > > I may end up changing the latter to CRUNCH_GENERATE_LINKS and default > that to yes, then allow the bsdbox build system to change that to > 'no', but the intent is the same. > > I'd like to commit this tomorrow if possible, so I can then follow it > up with the bsdbox import. > > Thanks, > > > Adrian Do it Adrian :) > > [adrian@pcbsd-macvm] ~/work/freebsd/head/src> svn diff Makefile.inc1 > share/mk 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} \ > Index: share/mk/bsd.crunchgen.mk > =================================================================== > --- share/mk/bsd.crunchgen.mk (revision 228757) > +++ share/mk/bsd.crunchgen.mk (working copy) > @@ -22,6 +22,8 @@ > # Specific links can be suppressed by setting > # CRUNCH_SUPPRESS_LINK_$(NAME) to 1. > # > +# If CRUNCH_SUPPRESS_ALL_LINKS is set to yes, no links will be > generated. +# > > # $FreeBSD$ > > @@ -39,6 +41,7 @@ > .else > CANONICALOBJDIR:= /usr/obj${.CURDIR} > .endif > +CRUNCH_SUPPRESS_ALL_LINKS?= no > > CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h > > @@ -51,6 +54,7 @@ > .else > $(OUTPUTS): $(.CURDIR)/../../$(D)/$(P)/Makefile > .endif > +.if ${CRUNCH_SUPPRESS_ALL_LINKS} != "yes" > .ifndef CRUNCH_SUPPRESS_LINK_${P} > LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(P) > .endif > @@ -59,6 +63,7 @@ > LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(A) > .endif > .endfor > +.endif > .endfor > .endfor > _______________________________________________ > freebsd-arch@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-arch > To unsubscribe, send any mail to > "freebsd-arch-unsubscribe@freebsd.org" -- Aleksandr Rybalko