From owner-freebsd-current@FreeBSD.ORG Tue Feb 22 16:20:00 2011 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B079106564A for ; Tue, 22 Feb 2011 16:20:00 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 2DFD18FC12 for ; Tue, 22 Feb 2011 16:20:00 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id B320946B03; Tue, 22 Feb 2011 11:19:59 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id BFA7C8A009; Tue, 22 Feb 2011 11:19:58 -0500 (EST) From: John Baldwin To: Ulrich =?iso-8859-1?q?Sp=F6rlein?= Date: Tue, 22 Feb 2011 09:44:22 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102151618.21934.jhb@freebsd.org> <20110218131731.GP65811@acme.spoerlein.net> In-Reply-To: <20110218131731.GP65811@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Message-Id: <201102220944.22511.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Tue, 22 Feb 2011 11:19:58 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=0.5 required=4.2 tests=BAYES_00,MAY_BE_FORGED, RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: FreeBSD current mailing list Subject: Re: Use meaningful directory prefixes in lib32 build X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 16:20:00 -0000 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