Date: Thu, 24 Aug 2006 21:04:23 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 104987 for review Message-ID: <200608242104.k7OL4NsW043332@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=104987 Change 104987 by imp@imp_bugs on 2006/08/24 21:03:56 We now make it through installing the includes before we die now... Affected files ... .. //depot/projects/arm/src/Makefile#3 edit .. //depot/projects/arm/src/Makefile.inc1#6 edit Differences ... ==== //depot/projects/arm/src/Makefile#3 (text+ko) ==== @@ -79,7 +79,7 @@ obj objlink regress rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ - build32 distribute32 install32 cross-devel cross-devel-install + build32 distribute32 install32 cross-build cross-devel cross-devel-install TGTS+= ${SUBDIR_TARGETS} BITGTS= files includes ==== //depot/projects/arm/src/Makefile.inc1#6 (text+ko) ==== @@ -1208,14 +1208,27 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \ -DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE -CDENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDEV} \ - TOOLS_PREFIX=/usr/${XDEV_ARCH} TARGET=${XDEV} \ - TARGET_ARCH=${XDEV_ARCH} \ +XDDIR=${XDEV}-${XDEV_ARCH} +XDTP=/usr/${XDDIR} +CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ + TARGET=${XDEV} \ + TARGET_ARCH=${XDEV_ARCH} +CDENV= ${CDBENV} \ + TOOLS_PREFIX=${XDTP} \ MACHINE=${XDEV} \ MACHINE_ARCH=${XDEV_ARCH} +CDTMP= ${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp CDMAKE=${CDENV} ${MAKE} ${NOFUN} -CD2MAKE=${CDENV} PATH=/usr/${XDEV}/usr/bin:${PATH} ${MAKE} ${NOFUN} +CD2MAKE=${CDENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} +XDDESTDIR=${DESTDIR}${XDTP} + +.ORDER: cross-build cross-devel cross-devel-install +xdev: cross-build cross-devel cross-devel-install + +cross-build: + ${_+_}cd ${.CURDIR}; \ + ${CDBENV} ${MAKE} -f Makefile.inc1 build-tools cross-devel: .for _tool in \ @@ -1228,15 +1241,17 @@ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor + ${_+_}cd ${.CURDIR}; ${TMAKE} build-tools + _cdi-mtree: - ${_+_}@${ECHODIR} "mtree populating /usr/${XDEV}" - mkdir -p /usr/${XDEV} + ${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}" + mkdir -p ${XDDESTDIR} mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \ - -p /usr/${XDEV} >/dev/null + -p ${XDDESTDIR} >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ - -p /usr/${XDEV}/usr >/dev/null + -p ${XDDESTDIR}/usr >/dev/null mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p /usr/${XDEV}/usr/include >/dev/null + -p ${XDDESTDIR}/usr/include >/dev/null cross-devel-install: _cdi-mtree .for _tool in \ @@ -1244,7 +1259,9 @@ gnu/usr.bin/cc ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${DESTDIR}/usr/${XDEV} + ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} .endfor - ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes DESTDIR=${DESTDIR}/usr/${XDEV} - ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries DESTDIR=${DESTDIR}/usr/${XDEV} + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes DESTDIR=${XDDESTDIR} + ${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries DESTDIR=${XDDESTDIR} + +.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608242104.k7OL4NsW043332>