From owner-freebsd-current@FreeBSD.ORG  Fri Feb 18 13:17:32 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 D3E3F106566C;
	Fri, 18 Feb 2011 13:17:32 +0000 (UTC)
	(envelope-from uqs@spoerlein.net)
Received: from acme.spoerlein.net (acme.spoerlein.net
	[IPv6:2a01:4f8:131:23c2::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BF0B8FC1B;
	Fri, 18 Feb 2011 13:17:32 +0000 (UTC)
Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1])
	by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id p1IDHVNl025960
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Fri, 18 Feb 2011 14:17:31 +0100 (CET)
	(envelope-from uqs@spoerlein.net)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net;
	s=dkim200908; t=1298035051;
	bh=ehltwWETfowsgTJiFWJXpLqw8tmIqa6smmafjqd/EHo=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	Content-Type:In-Reply-To;
	b=Rx+KF1rlO5pWietcQpr4RELtyDlXWZDsxLfwGzXutnh6yZEX6V1SNg7xll+xVk/sO
	wlc8W7rgP6+Qcl50YjAcspCV0po8dDyWI2Tm1DaFUm7MbF2G4tgr38DmNOI7Ulpdcz
	JRUeQ8DqObqhgCbyIjhviee90ztRSlLbSe30CSQ0=
Date: Fri, 18 Feb 2011 14:17:31 +0100
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@spoerlein.net>
To: John Baldwin <jhb@freebsd.org>
Message-ID: <20110218131731.GP65811@acme.spoerlein.net>
Mail-Followup-To: John Baldwin <jhb@freebsd.org>,
	FreeBSD current mailing list <current@freebsd.org>
References: <201102151618.21934.jhb@freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201102151618.21934.jhb@freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: FreeBSD current mailing list <current@freebsd.org>
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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Feb 2011 13:17:33 -0000

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 
> when lib32 builds certain areas of the tree the full path to those areas shows 
> up in the make output:
> 
> Index: Makefile.inc1
> ===================================================================
> --- Makefile.inc1	(revision 218554)
> +++ Makefile.inc1	(working copy)
> @@ -457,36 +457,38 @@ build32:
>  .for _t in obj depend all
>  	cd ${.CURDIR}/kerberos5/tools; \
>  	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
> -	    ${_t}
> +	    DIRPRFX=kerberos5/tools/ ${_t}
>  .endfor
>  .endif
>  .for _t in obj includes
> -	cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t}
> -	cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
> +	cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
> +	cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
>  .if ${MK_CDDL} != "no"
> -	cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t}
> +	cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t}
>  .endif
> -	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
> +	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=gnu/lib/ ${_t}
>  .if ${MK_CRYPT} != "no"
> -	cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t}
> +	cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=secure/lib/ ${_t}
>  .endif
>  .if ${MK_KERBEROS} != "no"
> -	cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} ${_t}
> +	cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=kerberos5/lib ${_t}
>  .endif
>  .endfor
>  .for _dir in usr.bin/lex/lib
> -	cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} obj
> +	cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=${_dir}/ obj
>  .endfor
>  .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
>  	cd ${.CURDIR}/${_dir}; \
>  	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
> -	    build-tools
> +	    DIRPRFX=${_dir}/ build-tools
>  .endfor
>  	cd ${.CURDIR}; \
>  	    ${LIB32WMAKE} -f Makefile.inc1 libraries
>  .for _t in obj depend all
> -	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} ${_t}
> -	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${_t}
> +	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \
> +	    DIRPRFX=libexec/rtld-elf/ ${_t}
> +	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \
> +	    DIRPRFX=usr.bin/ldd ${_t}
>  .endfor
>  
>  distribute32 install32:

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?

Uli