Changeset View
Changeset View
Standalone View
Standalone View
Makefile.inc1
Show First 20 Lines • Show All 549 Lines • ▼ Show 20 Lines | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ | ||||
-p ${WORLDTMP}/usr/include >/dev/null | -p ${WORLDTMP}/usr/include >/dev/null | ||||
ln -sf ${.CURDIR}/sys ${WORLDTMP} | ln -sf ${.CURDIR}/sys ${WORLDTMP} | ||||
.if ${MK_DEBUG_FILES} != "no" | .if ${MK_DEBUG_FILES} != "no" | ||||
# We could instead disable debug files for these build stages | # We could instead disable debug files for these build stages | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | ||||
-p ${WORLDTMP}/legacy/usr/lib >/dev/null | -p ${WORLDTMP}/legacy/usr/lib >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | ||||
-p ${WORLDTMP}/usr/lib >/dev/null | -p ${WORLDTMP}/usr/lib >/dev/null | ||||
. if ${MK_LIB32} != "no" | |||||
emaste: I nested these the other way for the tests debug files (`${MK_DEBUG_FILES}` inside of… | |||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${WORLDTMP}/legacy/usr/lib/debug/usr >/dev/null | |||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${WORLDTMP}/usr/lib/debug/usr >/dev/null | |||||
.endif | . endif | ||||
.endif | |||||
.if ${MK_LIB32} != "no" | |||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${WORLDTMP}/usr >/dev/null | |||||
.endif | |||||
Not Done Inline ActionsI think that nesting MK_DEBUG_FILES inside MK_TESTS makes more sense, and the consistency argument is strong. Changed. I've also removed the indentation of the .if statements for consistency as well. jmmv: I think that nesting `MK_DEBUG_FILES` inside `MK_TESTS` makes more sense, and the consistency… | |||||
.if ${MK_TESTS} != "no" | .if ${MK_TESTS} != "no" | ||||
mkdir -p ${WORLDTMP}${TESTSBASE} | mkdir -p ${WORLDTMP}${TESTSBASE} | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | ||||
-p ${WORLDTMP}${TESTSBASE} >/dev/null | -p ${WORLDTMP}${TESTSBASE} >/dev/null | ||||
.if ${MK_DEBUG_FILES} != "no" | .if ${MK_DEBUG_FILES} != "no" | ||||
mkdir -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} | mkdir -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | ||||
-p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} >/dev/null | -p ${WORLDTMP}/usr/lib/debug/${TESTSBASE} >/dev/null | ||||
▲ Show 20 Lines • Show All 76 Lines • ▼ Show 20 Lines | build32: | ||||
@echo "--------------------------------------------------------------" | @echo "--------------------------------------------------------------" | ||||
@echo ">>> stage 5.1: building 32 bit shim libraries" | @echo ">>> stage 5.1: building 32 bit shim libraries" | ||||
@echo "--------------------------------------------------------------" | @echo "--------------------------------------------------------------" | ||||
mkdir -p ${LIB32TMP}/usr/include | mkdir -p ${LIB32TMP}/usr/include | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ | ||||
-p ${LIB32TMP}/usr >/dev/null | -p ${LIB32TMP}/usr >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ | ||||
-p ${LIB32TMP}/usr/include >/dev/null | -p ${LIB32TMP}/usr/include >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${LIB32TMP}/usr >/dev/null | |||||
.if ${MK_DEBUG_FILES} != "no" | .if ${MK_DEBUG_FILES} != "no" | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | ||||
-p ${LIB32TMP}/usr/lib >/dev/null | -p ${LIB32TMP}/usr/lib >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${LIB32TMP}/usr/lib/debug/usr >/dev/null | |||||
.endif | .endif | ||||
mkdir -p ${WORLDTMP} | mkdir -p ${WORLDTMP} | ||||
ln -sf ${.CURDIR}/sys ${WORLDTMP} | ln -sf ${.CURDIR}/sys ${WORLDTMP} | ||||
.for _t in obj includes | .for _t in obj includes | ||||
cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t} | cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t} | ||||
cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t} | cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t} | ||||
.if ${MK_CDDL} != "no" | .if ${MK_CDDL} != "no" | ||||
cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t} | cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t} | ||||
▲ Show 20 Lines • Show All 228 Lines • ▼ Show 20 Lines | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ | ||||
-p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null | -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ | ||||
-p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null | -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ | ||||
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null | -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null | ||||
.if ${MK_DEBUG_FILES} != "no" | .if ${MK_DEBUG_FILES} != "no" | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \ | ||||
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null | -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null | ||||
. if ${MK_LIB32} != "no" | |||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/usr >/dev/null | |||||
.endif | . endif | ||||
.endif | |||||
.if ${MK_LIB32} != "no" | |||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null | |||||
.endif | |||||
.if ${MK_TESTS} != "no" && ${dist} == "tests" | .if ${MK_TESTS} != "no" && ${dist} == "tests" | ||||
-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} | -mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | ||||
-p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null | -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null | ||||
.if ${MK_DEBUG_FILES} != "no" | .if ${MK_DEBUG_FILES} != "no" | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | ||||
-p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null | -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null | ||||
.endif | .endif | ||||
▲ Show 20 Lines • Show All 1,329 Lines • ▼ Show 20 Lines | _xi-mtree: | ||||
${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" | ${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" | ||||
mkdir -p ${XDDESTDIR} | mkdir -p ${XDDESTDIR} | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ | ||||
-p ${XDDESTDIR} >/dev/null | -p ${XDDESTDIR} >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ | ||||
-p ${XDDESTDIR}/usr >/dev/null | -p ${XDDESTDIR}/usr >/dev/null | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ | ||||
-p ${XDDESTDIR}/usr/include >/dev/null | -p ${XDDESTDIR}/usr/include >/dev/null | ||||
.if ${MK_LIB32} != "no" | |||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.lib32.dist \ | |||||
-p ${XDDESTDIR}/usr >/dev/null | |||||
.endif | |||||
.if ${MK_TESTS} != "no" | .if ${MK_TESTS} != "no" | ||||
mkdir -p ${XDDESTDIR}${TESTSBASE} | mkdir -p ${XDDESTDIR}${TESTSBASE} | ||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ | ||||
-p ${XDDESTDIR}${TESTSBASE} >/dev/null | -p ${XDDESTDIR}${TESTSBASE} >/dev/null | ||||
.endif | .endif | ||||
.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries | .ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries | ||||
xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries | xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries | ||||
Show All 36 Lines |
I nested these the other way for the tests debug files (${MK_DEBUG_FILES} inside of ${MK_TESTS}) -- I can see arguments either way, but we should be consistent