d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed pkgs/ targets/

Browse Source
This commit is contained in:
Simon J. Gerraty 2014-11-30 18:45:46 +00:00
parent 6e7d005c83
commit 61ad1ff58d
9 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
share/mk/local.dirdeps.mk
View File

@ -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

4
share/mk/local.gendirdeps.mk
View File

@ -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* \

29
targets/Makefile
View File

@ -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"

4
targets/Makefile.inc
View File

@ -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

6
targets/pseudo/the-lot/Makefile.depend
View File

@ -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>

4
targets/pseudo/toolchain/Makefile.depend
View File

@ -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>

2
targets/pseudo/universe/Makefile
View File

@ -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

2
targets/pseudo/universe/Makefile.depend
View File

@ -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>

26
targets/pseudo/userland/Makefile.depend
View File

@ -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>