Source-Changes-HG archive

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

[src/trunk]: src/share/mk Fix dependency handling of UUDECODE_FILES (e.g. lib...



details:   https://anonhg.NetBSD.org/src/rev/277526ce9202
branches:  trunk
changeset: 785926:277526ce9202
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Apr 06 15:39:19 2013 +0000

description:
Fix dependency handling of UUDECODE_FILES (e.g. libexec/ld.aout_so on i386).

The .uue rule is defined to make "foo.xxx.uue" -> "foo.xxx".  When
UUDECODE_FILES_RENAME_* is also applied, the .uue rule tries to make "foo",
not "foo.xxx".  This results in that "foo.xxx" is never made and always
"foo.xxx.uue" -> "foo" is made.

Define dependency for intermediate files.

Avoid unnecessary rebuild and reinstall.  (Consume 70K in obj directory.)

diffstat:

 share/mk/bsd.files.mk |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r 30bece6912d1 -r 277526ce9202 share/mk/bsd.files.mk
--- a/share/mk/bsd.files.mk     Sat Apr 06 15:27:26 2013 +0000
+++ b/share/mk/bsd.files.mk     Sat Apr 06 15:39:19 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.files.mk,v 1.42 2011/09/10 16:57:35 apb Exp $
+#      $NetBSD: bsd.files.mk,v 1.43 2013/04/06 15:39:19 uebayasi Exp $
 
 .if !defined(_BSD_FILES_MK_)
 _BSD_FILES_MK_=1
@@ -136,13 +136,17 @@
 
 .uue:
        ${_MKTARGET_CREATE}
-       rm -f ${.TARGET} ${.TARGET}.tmp
-       ${TOOL_UUDECODE} -p ${.IMPSRC} > ${.TARGET}.tmp \
-           && mv ${.TARGET}.tmp ${UUDECODE_FILES_RENAME_${.TARGET}:U${.TARGET}}
+       rm -f ${.TARGET}
+       ${TOOL_UUDECODE} -p ${.IMPSRC} > ${.TARGET}
+
+.if defined(UUDECODE_FILES_RENAME_${UUDECODE_FILES})
+${UUDECODE_FILES_RENAME_${UUDECODE_FILES}}: ${UUDECODE_FILES}
+       cp ${.ALLSRC} ${.TARGET}
+.endif
 
 realall: ${UUDECODE_FILES}
 
-CLEANUUDECODE_FILES=${UUDECODE_FILES} ${UUDECODE_FILES:=.tmp}
+CLEANUUDECODE_FILES=${UUDECODE_FILES}
 .for i in ${UUDECODE_FILES}
 CLEANUUDECODE_FILES+=${UUDECODE_FILES_RENAME_${i}}
 .endfor



Home | Main Index | Thread Index | Old Index