Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2-0]: src/tools Pull up revision 1.27 (requested by jmc in ticket...



details:   https://anonhg.NetBSD.org/src/rev/b61c629717f2
branches:  netbsd-2-0
changeset: 561374:b61c629717f2
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 14 18:10:42 2004 +0000

description:
Pull up revision 1.27 (requested by jmc in ticket #473):
MKUPDATE cannot possibly do the right thing with GNU wrapped tools installs as
no dependencies are known in advance. So a simple 'build.sh -r -u' will
often lose and end up with a TOOLDIR without a toolchain, groff, etc. Fix
by forcing .install_done to always run.

diffstat:

 tools/Makefile.gnuhost |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (27 lines):

diff -r 1edd96b40128 -r b61c629717f2 tools/Makefile.gnuhost
--- a/tools/Makefile.gnuhost    Mon Jun 14 18:05:53 2004 +0000
+++ b/tools/Makefile.gnuhost    Mon Jun 14 18:10:42 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gnuhost,v 1.26 2004/02/27 14:52:01 skrll Exp $
+#      $NetBSD: Makefile.gnuhost,v 1.26.2.1 2004/06/14 18:10:42 tron Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -92,16 +92,8 @@
        @if [ ! -f $@ ] || [ -n "$$(find build -type f -newer .build_done -print)" ]; \
                then touch $@; fi
 
-.install_done: ${BUILD:D.build_done}
-.if ${MKUPDATE} != "no"
-       @cd ${.OBJDIR}; \
-       if [ ! -f .install_done ] || [ ! -f .build_done ] || \
-       [ -n "$$(find .build_done -prune -newer .install_done -print)" ]; then \
-               (cd build && ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}); \
-       fi
-.else
+.install_done! ${BUILD:D.build_done}
        @(cd ${.OBJDIR}/build && ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET})
-.endif
        @touch $@
 
 .PHONY: .build_done .install_done



Home | Main Index | Thread Index | Old Index