Page MenuHomeFreeBSD
Files F156407572

D4153.id10166.diff
No OneTemporary
Actions

D4153.id10166.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -106,7 +106,7 @@
# Note: we use this awkward construct to be compatible with FreeBSD's
# old make used in 10.0 and 9.2 and earlier.
-.if defined(MK_META_MODE) && ${MK_META_MODE} == "yes" && !make(showconfig)
+.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && !make(showconfig)
# targets/Makefile plays the role of top-level
.include "targets/Makefile"
.else
@@ -498,15 +498,15 @@
# This makefile does not run in meta mode
.MAKE.MODE= normal
# Normally the things we run from here don't either.
-# Using -DWITH_META_FILES
+# Using -DWITH_META_MODE
# we can buildworld with meta files created which are useful
# for debugging, but without any of the rest of a meta mode build.
-MK_META_MODE= no
+MK_DIRDEPS_BUILD= no
MK_STAGING= no
# tell meta.autodep.mk to not even think about updating anything.
UPDATE_DEPENDFILE= NO
.if !make(showconfig)
-.export MK_META_MODE MK_STAGING UPDATE_DEPENDFILE
+.export MK_DIRDEPS_BUILD MK_STAGING UPDATE_DEPENDFILE
.endif
.if make(universe)
@@ -516,4 +516,4 @@
.endif
.endif # bmake
-.endif # META_MODE
+.endif # DIRDEPS_BUILD
Index: include/Makefile
===================================================================
--- include/Makefile
+++ include/Makefile
@@ -166,7 +166,7 @@
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
-f ${.CURDIR}/../etc/mtree/BSD.include.dist \
-p ${DESTDIR}${INCLUDEDIR} > /dev/null
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
@touch ${.TARGET}
.endif
@@ -255,7 +255,7 @@
cd ${.CURDIR}/../sys/teken; \
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
${DESTDIR}${INCLUDEDIR}/teken
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
@touch ${.OBJDIR}/${.TARGET}
.endif
@@ -372,7 +372,7 @@
ln -fs ../../../sys/rpc/$$h \
${DESTDIR}${INCLUDEDIR}/rpc; \
done
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
@touch ${.OBJDIR}/${.TARGET}
.endif
Index: share/mk/bsd.dep.mk
===================================================================
--- share/mk/bsd.dep.mk
+++ share/mk/bsd.dep.mk
@@ -163,7 +163,7 @@
beforebuild: ${DHDRS}
.endif
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
.include <meta.autodep.mk>
# this depend: bypasses that below
# the dependency helps when bootstrapping
Index: share/mk/bsd.subdir.mk
===================================================================
--- share/mk/bsd.subdir.mk
+++ share/mk/bsd.subdir.mk
@@ -49,7 +49,7 @@
.include <bsd.init.mk>
.if !defined(NEED_SUBDIR)
-.if ${.MAKE.LEVEL} == 0 && ${MK_META_MODE} == "yes" && !empty(SUBDIR) && !(make(clean*) || make(destroy*))
+.if ${.MAKE.LEVEL} == 0 && ${MK_DIRDEPS_BUILD} == "yes" && !empty(SUBDIR) && !(make(clean*) || make(destroy*))
.include <meta.subdir.mk>
# ignore this
_SUBDIR:
Index: share/mk/local.meta.sys.mk
===================================================================
--- share/mk/local.meta.sys.mk
+++ share/mk/local.meta.sys.mk
@@ -2,7 +2,7 @@
# local configuration specific to meta mode
# XXX some of this should be in meta.sys.mk
-# we assume that MK_META_MODE=yes
+# we assume that MK_DIRDEPS_BUILD=yes
# we need this until there is an alternative
MK_INSTALL_AS_USER= yes
Index: share/mk/local.sys.mk
===================================================================
--- share/mk/local.sys.mk
+++ share/mk/local.sys.mk
@@ -1,6 +1,6 @@
# $FreeBSD$
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
MAKE_PRINT_VAR_ON_ERROR+= \
.CURDIR \
.MAKE \
Index: share/mk/sys.mk
===================================================================
--- share/mk/sys.mk
+++ share/mk/sys.mk
@@ -20,14 +20,14 @@
# Some options we need now
__DEFAULT_NO_OPTIONS= \
DIRDEPS_CACHE \
+ DIRDEPS_BUILD \
META_MODE \
- META_FILES \
__DEFAULT_DEPENDENT_OPTIONS= \
- AUTO_OBJ/META_MODE \
- STAGING/META_MODE \
- SYSROOT/META_MODE
+ AUTO_OBJ/DIRDEPS_BUILD \
+ STAGING/DIRDEPS_BUILD \
+ SYSROOT/DIRDEPS_BUILD
__ENV_ONLY_OPTIONS:= \
${__DEFAULT_NO_OPTIONS} \
@@ -43,9 +43,9 @@
.include <bsd.mkopt.mk>
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
.sinclude <meta.sys.mk>
-.elif ${MK_META_FILES} == "yes" && defined(.MAKEFLAGS)
+.elif ${MK_META_MODE} == "yes" && defined(.MAKEFLAGS)
.if ${.MAKEFLAGS:M-B} == ""
.MAKE.MODE= meta verbose
.endif
Index: usr.bin/xlint/llib/Makefile
===================================================================
--- usr.bin/xlint/llib/Makefile
+++ usr.bin/xlint/llib/Makefile
@@ -16,6 +16,6 @@
.include <bsd.prog.mk>
-.if ${MK_META_MODE} == "yes"
+.if ${MK_DIRDEPS_BUILD} == "yes"
LINTFLAGS+= -I${STAGE_INCLUDEDIR}
.endif

File Metadata

Mime Type
text/plain
Expires
Thu, May 14, 11:49 AM (5 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33038270
Default Alt Text
D4153.id10166.diff (4 KB)

Event Timeline