From owner-svn-src-head@FreeBSD.ORG  Thu Sep 12 22:19:44 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 818DE147;
 Thu, 12 Sep 2013 22:19:44 +0000 (UTC) (envelope-from jilles@stack.nl)
Received: from mx1.stack.nl (unknown [IPv6:2001:610:1108:5012::107])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A9412C33;
 Thu, 12 Sep 2013 22:19:44 +0000 (UTC)
Received: from turtle.stack.nl (turtle.stack.nl [IPv6:2001:610:1108:5010::132])
 by mx1.stack.nl (Postfix) with ESMTP id 48ED4120207;
 Fri, 13 Sep 2013 00:19:27 +0200 (CEST)
Received: by turtle.stack.nl (Postfix, from userid 1677)
 id 2BBCACB4E; Fri, 13 Sep 2013 00:19:27 +0200 (CEST)
Date: Fri, 13 Sep 2013 00:19:27 +0200
From: Jilles Tjoelker <jilles@stack.nl>
To: Joel Dahl <joel@vnode.se>
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>
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>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130905201540.GA23637@devbox.vnode.local>
User-Agent: Mutt/1.5.21 (2010-09-15)
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
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Sep 2013 22:19:44 -0000

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