Date: Wed, 16 Sep 1998 20:48:39 +0200 From: Andreas Klemm <andreas@klemm.gtn.com> To: current@FreeBSD.ORG Subject: patch for src/Makefile.inc[01] to make 'stages' readable by grep Message-ID: <19980916204839.A27213@klemm.gtn.com>
next in thread | raw e-mail | index | archive | help
May I commit this purely cosmetic but useful change to
both files ?
It would have the advantage that you can do a
grep '>>>' /usr/src/world.log
to see through which single "stages" a make world session went
before failing. Currently the output lines look like this and
aren't easily parseable:
--------------------------------------------------------------
elf make world started on Wed Sep 16 18:52:43 CEST 1998
--------------------------------------------------------------
--------------------------------------------------------------
Cleaning up the temporary elf build tree
--------------------------------------------------------------
Here the diff I want to apply.
--- Makefile.inc0.orig Wed Sep 16 20:39:03 1998
+++ Makefile.inc0 Wed Sep 16 20:37:33 1998
@@ -56,12 +56,12 @@
#
world:
@echo "--------------------------------------------------------------"
- @echo " ${OBJFORMAT} make world started on `LC_TIME=C date`"
+ @echo ">>> ${OBJFORMAT} make world started on `LC_TIME=C date`"
@echo "--------------------------------------------------------------"
.if target(pre-world)
@echo
@echo "--------------------------------------------------------------"
- @echo " Making 'pre-world' target"
+ @echo ">>> Making 'pre-world' target"
@echo "--------------------------------------------------------------"
@cd ${.CURDIR}; ${MK_ENV} ${MAKE} pre-world
.endif
@@ -76,13 +76,13 @@
.if target(post-world)
@echo
@echo "--------------------------------------------------------------"
- @echo " Making 'post-world' target"
+ @echo ">>> Making 'post-world' target"
@echo "--------------------------------------------------------------"
@cd ${.CURDIR}; ${MK_ENV} ${MAKE} post-world
.endif
@echo
@echo "--------------------------------------------------------------"
- @echo " ${OBJFORMAT} make world completed on `LC_TIME=C date`"
+ @echo ">>> ${OBJFORMAT} make world completed on `LC_TIME=C date`"
@echo "--------------------------------------------------------------"
#
--- Makefile.inc1.orig Wed Sep 16 20:36:48 1998
+++ Makefile.inc1 Wed Sep 16 20:41:52 1998
@@ -226,7 +226,7 @@
.if !defined(NOCLEAN)
@echo
@echo "--------------------------------------------------------------"
- @echo " Cleaning up the temporary ${OBJFORMAT} build tree"
+ @echo ">>> Cleaning up the temporary ${OBJFORMAT} build tree"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}
chflags -R noschg ${WORLDTMP}/
@@ -235,7 +235,7 @@
.if !defined(NOTOOLS)
@echo
@echo "--------------------------------------------------------------"
- @echo " Making make"
+ @echo ">>> Making make"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}/usr/bin ${MAKETMP}
( \
@@ -247,7 +247,7 @@
)
@echo
@echo "--------------------------------------------------------------"
- @echo " Making mtree"
+ @echo ">>> Making mtree"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}/usr/sbin ${WORLDTMP}/mtree
( \
@@ -260,79 +260,79 @@
.endif
@echo
@echo "--------------------------------------------------------------"
- @echo " Making hierarchy"
+ @echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 hierarchy
.if !defined(NOCLEAN)
@echo
@echo "--------------------------------------------------------------"
- @echo " Cleaning up the ${OBJFORMAT} obj tree"
+ @echo ">>> Cleaning up the ${OBJFORMAT} obj tree"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/}
.endif
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding the ${OBJFORMAT} obj tree"
+ @echo ">>> Rebuilding the ${OBJFORMAT} obj tree"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 par-${OBJDIR}
.if !defined(NOTOOLS)
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding ${OBJFORMAT} bootstrap tools"
+ @echo ">>> Rebuilding ${OBJFORMAT} bootstrap tools"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 bootstrap
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding tools necessary to build the include files"
+ @echo ">>> Rebuilding tools necessary to build the include files"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 include-tools
.endif
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding ${DESTDIR}/usr/include"
+ @echo ">>> Rebuilding ${DESTDIR}/usr/include"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; SHARED=copies ${BMAKE} -f Makefile.inc1 includes
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding bootstrap libraries"
+ @echo ">>> Rebuilding bootstrap libraries"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 bootstrap-libraries
.if !defined(NOTOOLS)
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding tools needed to build libraries"
+ @echo ">>> Rebuilding tools needed to build libraries"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 lib-tools
.endif
.if !defined(NOTOOLS)
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding all other tools needed to build the ${OBJFORMAT} world"
+ @echo ">>> Rebuilding all other tools needed to build the ${OBJFORMAT} world"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${BMAKE} -f Makefile.inc1 build-tools
.endif
.if !defined(_NODEPEND)
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding dependencies"
+ @echo ">>> Rebuilding dependencies"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${XMAKE} -f Makefile.inc1 par-depend
.endif
@echo
@echo "--------------------------------------------------------------"
- @echo " Building ${OBJFORMAT} libraries"
+ @echo ">>> Building ${OBJFORMAT} libraries"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${XMAKE} -DNOINFO -DNOMAN -f Makefile.inc1 libraries
@echo
@echo "--------------------------------------------------------------"
- @echo " Building everything.."
+ @echo ">>> Building everything.."
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${XMAKE} -f Makefile.inc1 all
everything:
@echo "--------------------------------------------------------------"
- @echo " Building everything.."
+ @echo ">>> Building everything.."
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${XMAKE} -f Makefile.inc1 all
@@ -353,24 +353,24 @@
#
reinstall:
@echo "--------------------------------------------------------------"
- @echo " Making hierarchy"
+ @echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 hierarchy
@echo
@echo "--------------------------------------------------------------"
- @echo " Installing everything.."
+ @echo ">>> Installing everything.."
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "aout"
@echo
@echo "--------------------------------------------------------------"
- @echo " Re-scanning the shared libraries.."
+ @echo ">>> Re-scanning the shared libraries.."
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; /sbin/ldconfig -R
.endif
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding man page indexes"
+ @echo ">>> Rebuilding man page indexes"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/share/man; ${MAKE} makedb
@@ -383,7 +383,7 @@
update:
.if defined(SUP_UPDATE)
@echo "--------------------------------------------------------------"
- @echo "Running ${SUP}"
+ @echo ">>> Running ${SUP}"
@echo "--------------------------------------------------------------"
@${SUP} ${SUPFLAGS} ${SUPFILE}
.if defined(SUPFILE1)
@@ -395,7 +395,7 @@
.endif
.if defined(CVS_UPDATE)
@echo "--------------------------------------------------------------"
- @echo "Updating /usr/src from cvs repository" ${CVSROOT}
+ @echo ">>> Updating /usr/src from cvs repository" ${CVSROOT}
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; cvs -q update -P -d
.endif
@@ -407,7 +407,7 @@
#
most:
@echo "--------------------------------------------------------------"
- @echo " Building programs only"
+ @echo ">>> Building programs only"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/bin; ${MAKE} all
cd ${.CURDIR}/sbin; ${MAKE} all
@@ -432,7 +432,7 @@
#
installmost:
@echo "--------------------------------------------------------------"
- @echo " Installing programs only"
+ @echo ">>> Installing programs only"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/bin; ${MAKE} install
cd ${.CURDIR}/sbin; ${MAKE} install
@@ -867,23 +867,23 @@
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "aout"
@echo
@echo "--------------------------------------------------------------"
- @echo " Making hierarchy"
+ @echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}
cd ${.CURDIR}; ${XMAKE} -f Makefile.inc1 hierarchy
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding the ${OBJFORMAT} obj tree"
+ @echo ">>> Rebuilding the ${OBJFORMAT} obj tree"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; ${XMAKE} -f Makefile.inc1 par-${OBJDIR}
@echo
@echo "--------------------------------------------------------------"
- @echo " Rebuilding ${DESTDIR}/usr/include"
+ @echo ">>> Rebuilding ${DESTDIR}/usr/include"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; SHARED=copies ${XMAKE} -f Makefile.inc1 includes
@echo
@echo "--------------------------------------------------------------"
- @echo " Building legacy libraries"
+ @echo ">>> Building legacy libraries"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}; \
${XMAKE} -DNOINFO -DNOMAN -f Makefile.inc1 bootstrap-libraries
@@ -891,19 +891,19 @@
${XMAKE} -DNOINFO -DNOMAN -f Makefile.inc1 libraries
@echo
@echo "--------------------------------------------------------------"
- @echo " Building legacy rtld"
+ @echo ">>> Building legacy rtld"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/libexec/rtld-aout; \
${XMAKE} -DNOMAN depend; ${XMAKE} -DNOMAN all;
@echo
@echo "--------------------------------------------------------------"
- @echo " Building legacy lkms"
+ @echo ">>> Building legacy lkms"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/lkm; \
${XMAKE} -DNOMAN depend; ${XMAKE} -DNOMAN all;
@echo
@echo "--------------------------------------------------------------"
- @echo " Building legacy boot"
+ @echo ">>> Building legacy boot"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/sys/${MACHINE}/boot; \
${XMAKE} -DNOMAN depend; ${XMAKE} -DNOMAN all;
@@ -917,23 +917,23 @@
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "aout"
@echo
@echo "--------------------------------------------------------------"
- @echo " Installing legacy libraries"
+ @echo ">>> Installing legacy libraries"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/lib; ${MAKE} -B -DNOMAN -DNOINFO install
cd ${.CURDIR}/gnu/lib; ${MAKE} -B -DNOMAN -DNOINFO install
@echo
@echo "--------------------------------------------------------------"
- @echo " Installing legacy rtld"
+ @echo ">>> Installing legacy rtld"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/libexec/rtld-aout; ${MAKE} -DNOMAN install
@echo
@echo "--------------------------------------------------------------"
- @echo " Installing legacy lkms"
+ @echo ">>> Installing legacy lkms"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/lkm; ${MAKE} -DNOMAN install
@echo
@echo "--------------------------------------------------------------"
- @echo " Installing legacy boot"
+ @echo ">>> Installing legacy boot"
@echo "--------------------------------------------------------------"
cd ${.CURDIR}/sys/${MACHINE}/boot; ${MAKE} -DNOMAN install
.endif
--
Andreas Klemm http://www.FreeBSD.ORG/~andreas
What gives you 90% more speed, for example, in kernel compilation ?
http://www.FreeBSD.ORG/~fsmp/SMP/akgraph-a/graph1.html
"NT = Not Today" (Maggie Biggs) ``powered by FreeBSD SMP''
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19980916204839.A27213>