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

-legacy and /.../legacy/... looks better than build or bootstrap in

Browse Source 
the logs, so use that instead.

Submitted by: obrien.
This commit is contained in:
Warner Losh 2003-04-06 21:46:44 +00:00
parent 5ceb21ff5d
commit 1c62f92354
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.inc1
View File

@ -159,7 +159,7 @@ INSTALLTMP!= /usr/bin/mktemp -d -u -t install
# #
# Building a world goes through the following stages # Building a world goes through the following stages
# #
# 1. libbuild stage [BMAKE] # 1. legacy stage [BMAKE]
# This stage is responsible for creating compatibility # This stage is responsible for creating compatibility
# shims that are needed by the bootstrap-tools, # shims that are needed by the bootstrap-tools,
# build-tools and cross-tools stages. # build-tools and cross-tools stages.
@ -281,15 +281,15 @@ _worldtmp:
mkdir -p ${WORLDTMP}/usr/include/${_dir} mkdir -p ${WORLDTMP}/usr/include/${_dir}
.endfor .endfor
ln -sf ${.CURDIR}/sys ${WORLDTMP} ln -sf ${.CURDIR}/sys ${WORLDTMP}
.for _dir in lib include/sys .for _dir in lib include include/sys
mkdir -p ${WORLDTMP}/build/usr/${_dir} mkdir -p ${WORLDTMP}/legacy/usr/${_dir}
.endfor .endfor
_libbuild: _legacy:
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> stage 1: libbuild" @echo ">>> stage 1: legacy release compatibility shims"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} libbuild cd ${.CURDIR}; ${BMAKE} legacy
_bootstrap-tools: _bootstrap-tools:
@echo @echo
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@ -350,7 +350,7 @@ everything:
WMAKE_TGTS= WMAKE_TGTS=
.if !defined(SUBDIR_OVERRIDE) .if !defined(SUBDIR_OVERRIDE)
WMAKE_TGTS+= _worldtmp _libbuild _bootstrap-tools WMAKE_TGTS+= _worldtmp _legacy _bootstrap-tools
.endif .endif
WMAKE_TGTS+= _cleanobj _obj _build-tools WMAKE_TGTS+= _cleanobj _obj _build-tools
.if !defined(SUBDIR_OVERRIDE) .if !defined(SUBDIR_OVERRIDE)
@ -618,16 +618,20 @@ installmost:
# #
# #
# libbuild: Build compatibility shims for the next three targets # legacy: Build compatibility shims for the next three targets
# #
libbuild: .if exists(${.CURDIR}/games) && !defined(NOGAMES)
_strfile= games/fortune/strfile
.endif
legacy:
.for _tool in tools/build .for _tool in tools/build
@${ECHODIR} "===> ${_tool}"; \ @${ECHODIR} "===> ${_tool}"; \
cd ${.CURDIR}/${_tool}; \ cd ${.CURDIR}/${_tool}; \
${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ obj; \
${MAKE} DIRPRFX=${_tool}/ depend; \ ${MAKE} DIRPRFX=${_tool}/ depend; \
${MAKE} DIRPRFX=${_tool}/ all; \ ${MAKE} DIRPRFX=${_tool}/ all; \
${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/build install ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
.endfor .endfor
# #

2
tools/build/Makefile
View File

@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../include .PATH: ${.CURDIR}/../../include
LIB= build LIB= egacy
SRCS= SRCS=
INCSGROUPS= INCS INCSGROUPS= INCS
INCS= INCS=

8
tools/build/Makefile.boot
View File

@ -9,10 +9,10 @@
CFLAGS+= -D__FBSDID=__RCSID CFLAGS+= -D__FBSDID=__RCSID
.endif .endif
CFLAGS+= -I${WORLDTMP}/build/usr/include CFLAGS+= -I${WORLDTMP}/legacy/usr/include
DPADD= ${WORLDTMP}/build/usr/lib/libbuild.a DPADD= ${WORLDTMP}/legacy/usr/lib/libegacy.a
LDADD= -lbuild LDADD= -legacy
LDFLAGS= -L${WORLDTMP}/build/usr/lib LDFLAGS= -L${WORLDTMP}/legacy/usr/lib
OLD_MAKE_CONF?= /etc/make.conf OLD_MAKE_CONF?= /etc/make.conf
.if exists(${OLD_MAKE_CONF}) .if exists(${OLD_MAKE_CONF})