Author: gabor (doc,ports committer)
Date: Sun Mar 15 13:14:06 2009
New Revision: 189850
URL: http://svn.freebsd.org/changeset/base/189850
Log:
- Create the buildworld object directories with mtree instead of various
mkdir calls
- Remove the ugly workaroung from libc NLS, which was to create some of
these directories
Modified:
head/Makefile.inc1
head/lib/libc/nls/Makefile.inc
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sun Mar 15 10:43:48 2009 (r189849)
+++ head/Makefile.inc1 Sun Mar 15 13:14:06 2009 (r189850)
@@ -344,30 +344,13 @@ _worldtmp:
rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
.endif
.for _dir in \
- usr/bin usr/games usr/include/sys usr/lib \
- usr/libexec usr/sbin usr/share/dict \
- usr/share/groff_font/devX100 \
- usr/share/groff_font/devX100-12 \
- usr/share/groff_font/devX75 \
- usr/share/groff_font/devX75-12 \
- usr/share/groff_font/devascii \
- usr/share/groff_font/devcp1047 \
- usr/share/groff_font/devdvi \
- usr/share/groff_font/devhtml \
- usr/share/groff_font/devkoi8-r \
- usr/share/groff_font/devlatin1 \
- usr/share/groff_font/devlbp \
- usr/share/groff_font/devlj4 \
- usr/share/groff_font/devps \
- usr/share/groff_font/devutf8 \
- usr/share/tmac/mdoc usr/share/tmac/mm
- mkdir -p ${WORLDTMP}/legacy/${_dir}
-.endfor
-.for _dir in \
- lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
- usr/libexec usr/sbin usr/share/misc
+ lib usr legacy/usr
mkdir -p ${WORLDTMP}/${_dir}
.endfor
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+ -p ${WORLDTMP}/legacy/usr >/dev/null
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+ -p ${WORLDTMP}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${WORLDTMP}/usr/include >/dev/null
ln -sf ${.CURDIR}/sys ${WORLDTMP}
@@ -448,10 +431,9 @@ build32:
@echo "--------------------------------------------------------------"
@echo ">>> stage 5.1: building 32 bit shim libraries"
@echo "--------------------------------------------------------------"
-.for _dir in \
- usr/include usr/lib32 usr/share/misc
- mkdir -p ${LIB32TMP}/${_dir}
-.endfor
+ mkdir -p ${LIB32TMP}/usr/lib32
+ mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+ -p ${LIB32TMP}/usr >/dev/null
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${LIB32TMP}/usr/include >/dev/null
mkdir -p ${WORLDTMP}
Modified: head/lib/libc/nls/Makefile.inc
==============================================================================
--- head/lib/libc/nls/Makefile.inc Sun Mar 15 10:43:48 2009
(r189849)
+++ head/lib/libc/nls/Makefile.inc Sun Mar 15 13:14:06 2009
(r189850)
@@ -30,9 +30,3 @@ NLS+= pl_PL.ISO8859-2
NLS+= ru_RU.KOI8-R
NLS+= sk_SK.ISO8859-2
NLS+= sv_SE.ISO8859-1
-
-.BEGIN:
-.for c in ${NLS}
- mkdir -p ${CANONICALOBJDIR}/../../lib32/usr/share/nls/${c}
- mkdir -p ${CANONICALOBJDIR}/../../tmp/usr/share/nls/${c}
-.endfor
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
