Date: Sun, 30 Nov 2014 18:45:47 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275339 - in projects/bmake: share/mk targets targets/pseudo/the-lot targets/pseudo/toolchain targets/pseudo/universe targets/pseudo/userland Message-ID: <201411301845.sAUIjlYY019567@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Sun Nov 30 18:45:46 2014 New Revision: 275339 URL: https://svnweb.freebsd.org/changeset/base/275339 Log: Renamed pkgs/ targets/ Modified: projects/bmake/share/mk/local.dirdeps.mk projects/bmake/share/mk/local.gendirdeps.mk projects/bmake/targets/Makefile projects/bmake/targets/Makefile.inc projects/bmake/targets/pseudo/the-lot/Makefile.depend projects/bmake/targets/pseudo/toolchain/Makefile.depend projects/bmake/targets/pseudo/universe/Makefile projects/bmake/targets/pseudo/universe/Makefile.depend projects/bmake/targets/pseudo/userland/Makefile.depend Modified: projects/bmake/share/mk/local.dirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.dirdeps.mk Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/share/mk/local.dirdeps.mk Sun Nov 30 18:45:46 2014 (r275339) @@ -17,6 +17,12 @@ DIRDEPS := ${.TARGETS:M*/*} ${.TARGETS:Nall}: all .endif +# making universe is special +.if defined(UNIVERSE_GUARD) +# these should be done by now +DIRDEPS_FILTER+= N*.host +.endif + # pseudo machines get no qualification .for m in host common M_dep_qual_fixes += C;($m),[^/.,]*$$;\1; @@ -75,9 +81,9 @@ DIRDEPS += \ DIRDEPS+= lib/clang/include .endif -# we need pkgs/pseudo/stage to prep the stage tree -.if ${DEP_RELDIR} != "pkgs/pseudo/stage" -DIRDEPS += pkgs/pseudo/stage +# we need targets/pseudo/stage to prep the stage tree +.if ${DEP_RELDIR} != "targets/pseudo/stage" +DIRDEPS += targets/pseudo/stage .endif CSU_DIR.i386 = csu/i386-elf Modified: projects/bmake/share/mk/local.gendirdeps.mk ============================================================================== --- projects/bmake/share/mk/local.gendirdeps.mk Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/share/mk/local.gendirdeps.mk Sun Nov 30 18:45:46 2014 (r275339) @@ -5,10 +5,10 @@ GENDIRDEPS_FILTER+= \ Ncddl/usr.bin/ctf* \ Nlib/clang/include \ Nlib/libc_nonshared \ - Npkgs/pseudo/stage* \ + Ntargets/pseudo/stage* \ Ntools/* -.if ${RELDIR:Mpkgs*} == "" +.if ${RELDIR:Mtargets*} == "" GENDIRDEPS_FILTER+= \ Nusr.bin/clang/clang.host \ Ngnu/usr.bin/cc* \ Modified: projects/bmake/targets/Makefile ============================================================================== --- projects/bmake/targets/Makefile Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/Makefile Sun Nov 30 18:45:46 2014 (r275339) @@ -35,23 +35,23 @@ # this is our top-level makefile .if make(pkg-*) -DIRDEPS_FILTER = Mpkgs/* +DIRDEPS_FILTER = Mtargets/* .endif # in theory, this is what we want -target_dirs = pkgs pkgs/pseudo +target_dirs = targets targets/pseudo # these tweak how we do it target_prefix = pkg- build- DIRDEPS := ${.TARGETS:Nall:${target_prefix:@p@S,^$p,,@:ts:}:@t@${target_dirs:@d@$d/$t@}@:@d@${exists(${SRCTOP}/$d):?$d:}@} -.if ${DIRDEPS:Mpkgs/pseudo/*} != "" +.if ${DIRDEPS:Mtargets/pseudo/*} != "" # all bets are off PKG_MACHINE_LIST = ${ALL_MACHINE_LIST} .endif .if make(check-commit) # a special case -DIRDEPS = pkgs/pseudo/check-commit +DIRDEPS = targets/pseudo/check-commit .if defined(ALL_MACHINES) CHECK_MACHINE_LIST = all .undef ALL_MACHINES @@ -127,16 +127,15 @@ start_utc := ${now_utc} _begin = count-makefiles -# by default, we clean pkgs/ which can otherwise accumulate a lot of cruft -.if ${NEED_CLEAN_PKGS:Uyes:tl} != "no" -_begin += clean-pkgs -.endif -.if defined(SHIPDIR) && ${NEED_CLEAN_SHIPDIR:Uno:tl} != "no" && exists(${SHIPDIR}) -_begin += clean-shipdir -.endif -.if ${NEED_CLEAN_ERROR_LOGS:Uyes:tl} == "yes" +__DEFAULT_YES_OPTIONS+= \ + CLEAN_ERROR_LOGS + +.include <bsd.mkopt.mk> + +.if ${MK_CLEAN_ERROR_LOGS} == "yes" _begin += clean-error-logs .endif + .if !empty(_begin) && !make(clean*) dirdeps: ${_begin} .WAIT .endif @@ -167,12 +166,6 @@ _build_failed: .NOMETA clean-error-logs: .NOMETA @test ! -d ${meta_error_log:H} || rm -f ${meta_error_log:H}/*log -clean-pkgs: .NOMETA - @rm -rf ${ALL_MACHINE_LIST:N${MACHINE}:@m@${OBJROOT}$m/pkgs@} ${OBJROOT}${MACHINE}/pkgs/* - -clean-shipdir: .NOMETA - ${"${SHIPDIR:tl:Nno:N*\:*}":?rm -f ${SHIPDIR}/*:} - .if !target(_DIRDEP_USE) # we did not read dirdeps.mk above, the target may be here .include "Makefile.xtras" Modified: projects/bmake/targets/Makefile.inc ============================================================================== --- projects/bmake/targets/Makefile.inc Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/Makefile.inc Sun Nov 30 18:45:46 2014 (r275339) @@ -6,9 +6,9 @@ __${_this}__: _CURDIR ?= ${.CURDIR} _OBJDIR ?= ${.OBJDIR} -.if ${RELDIR:Mpkgs/*} != "" || ${RELDIR} == "." +.if ${RELDIR:Mtargets/*} != "" || ${RELDIR} == "." -.if ${.MAKE.LEVEL} == 0 && ${RELDIR:Mpkgs/*} != "" +.if ${.MAKE.LEVEL} == 0 && ${RELDIR:Mtargets/*} != "" .if make(bootstrap*) || !exists(${_CURDIR}/${.MAKE.DEPENDFILE:T}) _bootstrap_dirdeps = yes .else Modified: projects/bmake/targets/pseudo/the-lot/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/the-lot/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/the-lot/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -5,8 +5,8 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} DIRDEPS = \ - pkgs/pseudo/kernel \ - pkgs/pseudo/toolchain \ - pkgs/pseudo/userland \ + targets/pseudo/kernel \ + targets/pseudo/toolchain \ + targets/pseudo/userland \ .include <dirdeps.mk> Modified: projects/bmake/targets/pseudo/toolchain/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/toolchain/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/toolchain/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -10,10 +10,10 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, DIRDEPS= usr.bin/xinstall .if ${MK_CLANG} == "yes" -DIRDEPS+= pkgs/pseudo/clang +DIRDEPS+= targets/pseudo/clang .endif .if ${MK_GCC} == "yes" -DIRDEPS+= pkgs/pseudo/gcc +DIRDEPS+= targets/pseudo/gcc .endif .include <dirdeps.mk> Modified: projects/bmake/targets/pseudo/universe/Makefile ============================================================================== --- projects/bmake/targets/pseudo/universe/Makefile Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/universe/Makefile Sun Nov 30 18:45:46 2014 (r275339) @@ -32,7 +32,7 @@ # # this is the RELDIR of the target we build -UNIVERSE_TARGET_RELDIR?= pkgs/pseudo/the-lot +UNIVERSE_TARGET_RELDIR?= targets/pseudo/the-lot # the list of machines TARGET_MACHINE_LIST = i386 amd64 Modified: projects/bmake/targets/pseudo/universe/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/universe/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/universe/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -8,7 +8,7 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, # our role here is to build all the host tools etc. DIRDEPS = \ - pkgs/pseudo/hosttools.host \ + targets/pseudo/hosttools.host \ .include <dirdeps.mk> Modified: projects/bmake/targets/pseudo/userland/Makefile.depend ============================================================================== --- projects/bmake/targets/pseudo/userland/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) +++ projects/bmake/targets/pseudo/userland/Makefile.depend Sun Nov 30 18:45:46 2014 (r275339) @@ -7,18 +7,18 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,, DEP_MACHINE := ${.PARSEFILE:E} DIRDEPS = \ - pkgs/pseudo/bin \ - pkgs/pseudo/cddl \ - pkgs/pseudo/games \ - pkgs/pseudo/gnu \ - pkgs/pseudo/include \ - pkgs/pseudo/kerberos5 \ - pkgs/pseudo/lib \ - pkgs/pseudo/libexec \ - pkgs/pseudo/sbin \ - pkgs/pseudo/secure \ - pkgs/pseudo/share \ - pkgs/pseudo/usr.bin \ - pkgs/pseudo/usr.sbin \ + targets/pseudo/bin \ + targets/pseudo/cddl \ + targets/pseudo/games \ + targets/pseudo/gnu \ + targets/pseudo/include \ + targets/pseudo/kerberos5 \ + targets/pseudo/lib \ + targets/pseudo/libexec \ + targets/pseudo/sbin \ + targets/pseudo/secure \ + targets/pseudo/share \ + targets/pseudo/usr.bin \ + targets/pseudo/usr.sbin \ .include <dirdeps.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411301845.sAUIjlYY019567>