From owner-svn-src-projects@FreeBSD.ORG Fri May 16 17:50:24 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F4F41B5; Fri, 16 May 2014 17:50:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C60F278B; Fri, 16 May 2014 17:50:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GHoO1P091852; Fri, 16 May 2014 17:50:24 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GHoO0i091850; Fri, 16 May 2014 17:50:24 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201405161750.s4GHoO0i091850@svn.freebsd.org> From: "Simon J. Gerraty" Date: Fri, 16 May 2014 17:50:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r266264 - in projects/bmake/pkgs: . pseudo/bootstrap-tools X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 May 2014 17:50:24 -0000 Author: sjg Date: Fri May 16 17:50:23 2014 New Revision: 266264 URL: http://svnweb.freebsd.org/changeset/base/266264 Log: Use Makefile.depend.host for bootstrap-tools so it automatically builds for host Added: projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile.depend.host - copied unchanged from r265800, projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile.depend Deleted: projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile.depend Modified: projects/bmake/pkgs/Makefile Modified: projects/bmake/pkgs/Makefile ============================================================================== --- projects/bmake/pkgs/Makefile Fri May 16 17:45:09 2014 (r266263) +++ projects/bmake/pkgs/Makefile Fri May 16 17:50:23 2014 (r266264) @@ -60,8 +60,9 @@ SHIPDIR = no .else +all_machine_list = ${ALL_MACHINE_LIST} host common .if defined(ALL_MACHINES) -DIRDEPS := ${DIRDEPS:O:u:@d@${ALL_MACHINE_LIST:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T:R}.$m):?$d.$m:}@}@} +DIRDEPS := ${DIRDEPS:O:u:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}.$m):?$d.$m:}@}@} .undef ALL_MACHINES PKG_MACHINE_LIST ?= ${DIRDEPS:E:O:u} .elif defined(HOST_MACHINE) && ${MACHINE} == ${HOST_MACHINE} @@ -69,10 +70,9 @@ PKG_MACHINE_LIST ?= ${DIRDEPS:E:O:u} # some packages only support one machine which may not be ${MACHINE} # some support multiple, in which case unless ALL_MACHINES is defined # we only want ${MACHINE} -plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T:R}):?$d:}@} +plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}):?$d:}@} .if ${plain} != ${DIRDEPS} -all_machine_list = ${ALL_MACHINE_LIST} host -qual := ${DIRDEPS:${plain:${M_ListToSkip}}:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T:R}.$m):?$d.$m:}@}@} +qual := ${DIRDEPS:${plain:${M_ListToSkip}}:@d@${all_machine_list:O:u:@m@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}.$m):?$d.$m:}@}@} DIRDEPS := ${plain} ${qual} PKG_MACHINE_LIST ?= ${MACHINE} ${qual:E:O:u} .endif @@ -88,6 +88,24 @@ PKG_MACHINE_LIST := ${PKG_MACHINE_LIST} .endif .endif +# we don't use DIRDEPS_FILTER, since we only want it to +# apply to this initial list +.if !empty(REQUESTED_MACHINE) && !empty(DIRDEPS) +# this is a variant of the logic above, we want plain +# but need to filter the qualified DIRDEPS to REQUESTED_MACHINE +plain := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE_PREFIX:T}):?$d:}@} +.if ${plain} != ${DIRDEPS} +qual := ${DIRDEPS:${plain:${M_ListToSkip}}:M*.${REQUESTED_MACHINE}} +.if empty(qual) +qual := ${DIRDEPS:@d@${exists(${SRCTOP}/$d/${.MAKE.DEPENDFILE:T}):?$d.${.MAKE.DEPENDFILE:E}:}@} +.endif +DIRDEPS := ${plain} ${qual} +.endif +.if empty(DIRDEPS) +.error ${REQUESTED_MACHINE} is not appropriate for ${DEP_RELDIR:T} +.endif +.endif + .if !empty(build_options) build_options := ${build_options:O:u} .for v in ${build_options} Copied: projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile.depend.host (from r265800, projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile.depend) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile.depend.host Fri May 16 17:50:23 2014 (r266264, copy of r265800, projects/bmake/pkgs/pseudo/bootstrap-tools/Makefile.depend) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +# This file is not autogenerated - take care! + +DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} + +DIRDEPS = + + +.include