From owner-cvs-src@FreeBSD.ORG  Tue Jun 17 10:50:07 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4DAB106567A;
	Tue, 17 Jun 2008 10:50:07 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from mail.cksoft.de (mail.cksoft.de [62.111.66.27])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F1718FC19;
	Tue, 17 Jun 2008 10:50:07 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from localhost (amavis.str.cksoft.de [192.168.74.71])
	by mail.cksoft.de (Postfix) with ESMTP id E086241C75B;
	Tue, 17 Jun 2008 12:50:05 +0200 (CEST)
X-Virus-Scanned: amavisd-new at cksoft.de
Received: from mail.cksoft.de ([62.111.66.27])
	by localhost (amavis.str.cksoft.de [192.168.74.71]) (amavisd-new,
	port 10024)
	with ESMTP id srE9j8Z44upd; Tue, 17 Jun 2008 12:50:05 +0200 (CEST)
Received: by mail.cksoft.de (Postfix, from userid 66)
	id 8681841C759; Tue, 17 Jun 2008 12:50:05 +0200 (CEST)
Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net
	[10.111.66.10])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.int.zabbadoz.net (Postfix) with ESMTP id 8A9F744487F;
	Tue, 17 Jun 2008 10:47:32 +0000 (UTC)
Date: Tue, 17 Jun 2008 10:47:31 +0000 (UTC)
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
X-X-Sender: bz@maildrop.int.zabbadoz.net
To: Poul-Henning Kamp <phk@phk.freebsd.dk>
In-Reply-To: <75185.1213698178@critter.freebsd.dk>
Message-ID: <20080617103603.W83875@maildrop.int.zabbadoz.net>
References: <75185.1213698178@critter.freebsd.dk>
X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src Makefile 
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jun 2008 10:50:07 -0000

On Tue, 17 Jun 2008, Poul-Henning Kamp wrote:

> In message <200806170911.m5H9BncF010061@repoman.freebsd.org>, "Bjoern A. Zeeb"
> writes:
>> bz          2008-06-17 09:06:46 UTC
>>
>>  FreeBSD src repository
>>
>>  Modified files:
>>    .                    Makefile
>>  Log:
>>  SVN rev 179842 on 2008-06-17 09:06:46Z by bz
>>
>>  For make universe, in addition to make.conf, also ignore a
>>  src.conf with possibe non-default options.
>
> Actually, that was deliberately not ignored to make it possible
> to test nonstandard trees with universe also.

Okay. I am not sure how it worked in the old make.conf only days.

I usually forget that I do have a per machine /etc/src.conf until the
next morning, thus nightly universe do not help me before committing
because it doesn't give me the builds that everyone else/the tb is
building. And we are still setting __MAKE_CONF to /dev/null thus any
private CFLAGS etc. cannot be tested this way either.

Maybe we need a better overall solution?

I have no idea if we can implement it only for universe but what about
something like this?
- do not pre-define __MAKE_CONF/SRCCONF for universe
- if __MAKE_CONF/SRCCONF is not defined manually (env) we'll ingore it
   (it's not set)
- if it is defined (env) use it


-- 
Bjoern A. Zeeb              Stop bit received. Insert coin for new game.