Date: Fri, 13 Sep 2013 00:19:27 +0200 From: Jilles Tjoelker <jilles@stack.nl> To: Joel Dahl <joel@vnode.se> Cc: src-committers@freebsd.org, John Baldwin <jhb@freebsd.org>, Peter Wemm <peter@freebsd.org>, svn-src-all@freebsd.org, Dimitry Andric <dim@freebsd.org>, gabor@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r254273 - in head: . include lib lib/libc/iconv lib/libiconv_compat lib/libkiconv share/mk sys/sys tools/build/mk Message-ID: <20130912221927.GA473@stack.nl> In-Reply-To: <20130905201540.GA23637@devbox.vnode.local> References: <201308130715.r7D7F1nu076335@svn.freebsd.org> <20130822155835.GA52789@devbox.vnode.local> <20130903195241.GA93218@devbox.vnode.local> <201309051013.35286.jhb@freebsd.org> <20130905201540.GA23637@devbox.vnode.local>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Sep 05, 2013 at 10:15:40PM +0200, Joel Dahl wrote:
> Installworld is still broken on systems with readonly /usr/obj.
I use this. It makes the mapper.dir and similar files depend on their
actual sources instead of phony targets, and therefore only rebuilt when
needed.
Index: share/i18n/csmapper/Makefile
===================================================================
--- share/i18n/csmapper/Makefile (revision 255496)
+++ share/i18n/csmapper/Makefile (working copy)
@@ -6,7 +6,16 @@
SUBDIR= APPLE AST BIG5 CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 JIS \
KAZAKH KOI KS MISC TCVN
-mapper.dir: ${SUBDIR}
+.for i in ${SUBDIR}
+${i}/mapper.dir.${i}:
+ ${MAKE} -C ${.CURDIR}/${i} all
+mapper.dir: ${i}/mapper.dir.${i}
+${i}/charset.pivot.${i}:
+ ${MAKE} -C ${.CURDIR}/${i} all
+charset.pivot: ${i}/charset.pivot.${i}
+.endfor
+
+mapper.dir:
> ${.TARGET}
.for i in ${SUBDIR}
cat ${i}/mapper.dir.${i} >> ${.TARGET}
@@ -17,7 +26,7 @@
FILES+= mapper.dir mapper.dir.db
CLEANFILES+= mapper.dir mapper.dir.db
-charset.pivot: ${SUBDIR}
+charset.pivot:
> ${.TARGET}
.for i in ${SUBDIR}
cat ${i}/charset.pivot.${i} >> ${.TARGET}
Index: share/i18n/esdb/Makefile
===================================================================
--- share/i18n/esdb/Makefile (revision 255496)
+++ share/i18n/esdb/Makefile (working copy)
@@ -9,7 +9,16 @@
FILES+= esdb.dir esdb.dir.db esdb.alias esdb.alias.db
CLEANFILES= ${FILES}
-esdb.dir: ${SUBDIR}
+.for i in ${SUBDIR}
+${i}/esdb.dir.${i}:
+ ${MAKE} -C ${.CURDIR}/${i} all
+esdb.dir: ${i}/esdb.dir.${i}
+${i}/esdb.alias.${i}:
+ ${MAKE} -C ${.CURDIR}/${i} all
+esdb.alias: ${i}/esdb.alias.${i}
+.endfor
+
+esdb.dir:
> $@
.for i in ${SUBDIR}
cat ${i}/esdb.dir.${i} >>${.TARGET}
@@ -17,7 +26,7 @@
esdb.dir.db: esdb.dir
${MKESDB} -m -o ${.TARGET} ${.ALLSRC}
-esdb.alias: ${SUBDIR}
+esdb.alias:
> $@
.for i in ${SUBDIR}
cat ${i}/esdb.alias.${i} >>${.TARGET}
--
Jilles Tjoelker
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130912221927.GA473>