d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

share/i18n: Fix installworld with read-only obj.

Browse Source 
Since iconv was enabled (r254273, August 13), it has been impossible to
installworld using a read-only obj tree. This is common with NFS. Parts of
share/i18n unconditionally rebuild files like mapper.dir during
installation.

This patch ensures the files like mapper.dir are not rewritten with the same
contents.

Tested by:	joel
Approved by:	re (hrs)
This commit is contained in:
Jilles Tjoelker 2013-09-17 20:09:25 +00:00
parent 040f9b1e84
commit f7044509cb
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
share/i18n/csmapper/Makefile
View File

@ -7,10 +7,11 @@ SUBDIR= APPLE AST BIG5 CNS CP EBCDIC GB GEORGIAN ISO646 ISO-8859 JIS \
KAZAKH KOI KS MISC TCVN KAZAKH KOI KS MISC TCVN
mapper.dir: ${SUBDIR} mapper.dir: ${SUBDIR}
> ${.TARGET} newfile=$$(for i in ${SUBDIR}; do \
.for i in ${SUBDIR} cat $$i/mapper.dir.$$i; \
cat ${i}/mapper.dir.${i} >> ${.TARGET} done); \
.endfor [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
printf '%s\n' "$$newfile" >${.TARGET}
mapper.dir.db: mapper.dir mapper.dir.db: mapper.dir
${MKCSMAPPER} -m -o ${.TARGET} ${.ALLSRC} ${MKCSMAPPER} -m -o ${.TARGET} ${.ALLSRC}
@ -18,10 +19,11 @@ FILES+= mapper.dir mapper.dir.db
CLEANFILES+= mapper.dir mapper.dir.db CLEANFILES+= mapper.dir mapper.dir.db
charset.pivot: ${SUBDIR} charset.pivot: ${SUBDIR}
> ${.TARGET} newfile=$$(for i in ${SUBDIR}; do \
.for i in ${SUBDIR} cat $$i/charset.pivot.$$i; \
cat ${i}/charset.pivot.${i} >> ${.TARGET} done); \
.endfor [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
printf '%s\n' "$$newfile" >${.TARGET}
charset.pivot.pvdb: charset.pivot charset.pivot.pvdb: charset.pivot
${MKCSMAPPER} -p -o ${.TARGET} ${.ALLSRC} ${MKCSMAPPER} -p -o ${.TARGET} ${.ALLSRC}

18
share/i18n/esdb/Makefile
View File

@ -10,18 +10,20 @@ FILES+= esdb.dir esdb.dir.db esdb.alias esdb.alias.db
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
esdb.dir: ${SUBDIR} esdb.dir: ${SUBDIR}
> $@ newfile=$$(for i in ${SUBDIR}; do \
.for i in ${SUBDIR} cat $$i/esdb.dir.$$i; \
cat ${i}/esdb.dir.${i} >>${.TARGET} done); \
.endfor [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
printf '%s\n' "$$newfile" >${.TARGET}
esdb.dir.db: esdb.dir esdb.dir.db: esdb.dir
${MKESDB} -m -o ${.TARGET} ${.ALLSRC} ${MKESDB} -m -o ${.TARGET} ${.ALLSRC}
esdb.alias: ${SUBDIR} esdb.alias: ${SUBDIR}
> $@ newfile=$$(for i in ${SUBDIR}; do \
.for i in ${SUBDIR} cat $$i/esdb.alias.$$i; \
cat ${i}/esdb.alias.${i} >>${.TARGET} done); \
.endfor [ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
printf '%s\n' "$$newfile" >${.TARGET}
esdb.alias.db: esdb.alias esdb.alias.db: esdb.alias
${MKESDB} -m -o ${.TARGET} ${.ALLSRC} ${MKESDB} -m -o ${.TARGET} ${.ALLSRC}