Date: Tue, 22 Feb 2011 09:44:22 -0500 From: John Baldwin <jhb@freebsd.org> To: Ulrich =?iso-8859-1?q?Sp=F6rlein?= <uqs@spoerlein.net> Cc: FreeBSD current mailing list <current@freebsd.org> Subject: Re: Use meaningful directory prefixes in lib32 build Message-ID: <201102220944.22511.jhb@freebsd.org> In-Reply-To: <20110218131731.GP65811@acme.spoerlein.net> References: <201102151618.21934.jhb@freebsd.org> <20110218131731.GP65811@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday, February 18, 2011 8:17:31 am Ulrich Sp=F6rlein wrote:
> On Tue, 15.02.2011 at 16:18:21 -0500, John Baldwin wrote:
> > This patch adjusts the various lib32 targets to use a suitable DIRPRFX =
so that=20
> > when lib32 builds certain areas of the tree the full path to those area=
s shows=20
> > up in the make output:
> >=20
> > Index: Makefile.inc1
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > --- Makefile.inc1 (revision 218554)
> > +++ Makefile.inc1 (working copy)
> > @@ -457,36 +457,38 @@ build32:
> > .for _t in obj depend all
> > cd ${.CURDIR}/kerberos5/tools; \
> > MAKEOBJDIRPREFIX=3D${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS=3D DESTDIR=
=3D \
> > - ${_t}
> > + DIRPRFX=3Dkerberos5/tools/ ${_t}
> > .endfor
> > .endif
> > .for _t in obj includes
> > - cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t}
> > - cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
> > + cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=3Dinclude/ ${_t}
> > + cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=3Dlib/ ${_t}
> > .if ${MK_CDDL} !=3D "no"
> > - cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t}
> > + cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=3Dcddl/lib/ ${_t}
> > .endif
> > - cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
> > + cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=3Dgnu/lib/ ${_t}
> > .if ${MK_CRYPT} !=3D "no"
> > - cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t}
> > + cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=3Dsecure/lib/ ${_t}
> > .endif
> > .if ${MK_KERBEROS} !=3D "no"
> > - cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t}
> > + cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=3Dkerberos5/lib ${=
_t}
> > .endif
> > .endfor
> > .for _dir in usr.bin/lex/lib
> > - cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj
> > + cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=3D${_dir}/ obj
> > .endfor
> > .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
> > cd ${.CURDIR}/${_dir}; \
> > MAKEOBJDIRPREFIX=3D${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS=3D DESTDIR=
=3D \
> > - build-tools
> > + DIRPRFX=3D${_dir}/ build-tools
> > .endfor
> > cd ${.CURDIR}; \
> > ${LIB32WMAKE} -f Makefile.inc1 libraries
> > .for _t in obj depend all
> > - cd ${.CURDIR}/libexec/rtld-elf; PROG=3Dld-elf32.so.1 ${LIB32WMAKE} ${=
_t}
> > - cd ${.CURDIR}/usr.bin/ldd; PROG=3Dldd32 ${LIB32WMAKE} ${_t}
> > + cd ${.CURDIR}/libexec/rtld-elf; PROG=3Dld-elf32.so.1 ${LIB32WMAKE} \
> > + DIRPRFX=3Dlibexec/rtld-elf/ ${_t}
> > + cd ${.CURDIR}/usr.bin/ldd; PROG=3Dldd32 ${LIB32WMAKE} \
> > + DIRPRFX=3Dusr.bin/ldd ${_t}
> > .endfor
> > =20
> > distribute32 install32:
>=20
> I have no idea what DIRPRFX actually does, but will it also move the
> actual OBJDIR location to something more sensible, or is only make's
> (terminal) output affected?
It just affects terminal output:
bsd.subdir.mk: ${ECHODIR} "=3D=3D=3D> ${DIRPRFX}$${entry}.=
${MACHINE_ARCH} (${.TARGET:realinstall=3Dinstall})"; \
bsd.subdir.mk: ${ECHODIR} "=3D=3D=3D> ${DIRPRFX}$$entry ($=
{.TARGET:realinstall=3Dinstall})"; \
bsd.subdir.mk: DIRPRFX=3D${DIRPRFX}$$edir/; \
=2D-=20
John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102220944.22511.jhb>