From owner-freebsd-ports@FreeBSD.ORG Wed Jun 20 12:28:38 2012 Return-Path: Delivered-To: ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95E9C106566C; Wed, 20 Jun 2012 12:28:38 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78]) by mx1.freebsd.org (Postfix) with ESMTP id 07E108FC1E; Wed, 20 Jun 2012 12:28:37 +0000 (UTC) Received: from seedling.black-earth.co.uk (seedling.black-earth.co.uk [81.187.76.163]) (authenticated bits=0) by smtp.infracaninophile.co.uk (8.14.5/8.14.5) with ESMTP id q5KCSX0t021549 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Wed, 20 Jun 2012 13:28:34 +0100 (BST) (envelope-from matthew@FreeBSD.org) X-DKIM: OpenDKIM Filter v2.5.2 smtp.infracaninophile.co.uk q5KCSX0t021549 Authentication-Results: smtp.infracaninophile.co.uk/q5KCSX0t021549; dkim=none (no signature); dkim-adsp=none Message-ID: <4FE1C1EA.8070901@FreeBSD.org> Date: Wed, 20 Jun 2012 13:28:26 +0100 From: Matthew Seaman User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:13.0) Gecko/20120614 Thunderbird/13.0.1 MIME-Version: 1.0 To: Baptiste Daroussin References: <4FE12F2D.9080302@FreeBSD.org> <20120620061136.GA79164@ithaqua.etoilebsd.net> <4FE1829D.6030109@FreeBSD.org> <20120620091321.GA83730@ithaqua.etoilebsd.net> <20120620094431.M12775@martymac.org> <20120620103412.GB83730@ithaqua.etoilebsd.net> In-Reply-To: <20120620103412.GB83730@ithaqua.etoilebsd.net> X-Enigmail-Version: 1.4.2 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig819360C2F8690D64C34DBDED" X-Virus-Scanned: clamav-milter 0.97.5 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lucid-nonsense.infracaninophile.co.uk Cc: ports@FreeBSD.org, Michael Scheidell , Ganael LAPLANCHE Subject: Re: optionsng and tinderbox? X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jun 2012 12:28:38 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig819360C2F8690D64C34DBDED Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 20/06/2012 11:34, Baptiste Daroussin wrote: > On Wed, Jun 20, 2012 at 09:54:45AM +0000, Ganael LAPLANCHE wrote: >> On Wed, 20 Jun 2012 11:13:21 +0200, Baptiste Daroussin wrote >> >> Hi Baptiste, >> >>> make -VUNIQUENAME should show you the right name >> >> I have a port where UNIQUENAME is *not* the right prefix to use before= >> '_SET' for positioning this specific port's options : >> >> $ pwd >> /usr/ports/net/openldap24-client >> >> $ make -V UNIQUENAME >> openldap24-client >> >> $ make -V PORT_OPTIONS >> DOCS EXAMPLES NLS >> >> $ make openldap24-client_SET=3DFETCH -V PORT_OPTIONS >> DOCS EXAMPLES NLS >> >> but : >> >> $ make openldap24-server_SET=3DFETCH -V PORT_OPTIONS >> DOCS EXAMPLES FETCH NLS >> >> So, here, I have to set the following in make.conf : >> >> openldap24-server_SET+=3DFETCH >> >> and not : >> >> openldap24-client_SET+=3DFETCH >> >> which would not work. > This is about to be fixed by the the uniquename being really unique (se= e > matthew@) CFT. Hmmm... Except my patches make no difference here: % cd /usr/ports/net/openldap24-client % make -V UNIQUENAME openldap24-client % make -V PORT_OPTIONS DOCS EXAMPLES NLS % make openldap24-client_SET=3DFETCH -V PORT_OPTIONS DOCS EXAMPLES NLS After looking into this a bit more deeply, there are two different problems here. 1) Setting ${${UNIQUENAME}_SET} on the command line to override the settings in OPTIONSFILE -- looks like a logic problem. bsd.options.mk sets all the foo_SET options from make.conf or the command line around line 106: =2E for opt in ${${UNIQUENAME}_SET} PORT_OPTIONS+=3D ${opt} =2E endfor but then around line 124 it has: =2Efor opt in ${OPTIONS_FILE_UNSET} PORT_OPTIONS:=3D ${PORT_OPTIONS:N${opt}} =2Eendfor and if the OPTIONSFILE exists from a previous 'make config' all the different options are listed in it either in OPTIONS_FILE_UNSET or OPTIONS_FILE_SET. Which means OPTIONSFILE overrides make.conf for *setting* variables. Shouldn't make.conf / commandline settings override OPTIONSFILE rather than the other way round? Seems there's not much point in being able to set options from make.conf unless that is so, as OPTIONSFILE would be created more often than not whenever make(1) was invoked in the port's directory. 2) There is a port-specific problem: the port overrides the OPTIONSFILE setting, before my patches as a side-effect of setting LATEST_LINK and specifically preserved in the patch by using the new OPTIONS_DIR variable= =2E Before my patches the port had: % make -V UNIQUENAME -V LATEST_LINK -V OPTIONSFILE openldap24 openldap24-client /var/db/ports/openldap24/options % cd ../openldap24-server % make -V UNIQUENAME -V LATEST_LINK -V OPTIONSFILE openldap24 openldap24-server /var/db/ports/openldap24/options After patching, it has: % cd ../openldap24-client % make -V UNIQUENAME -V LATEST_LINK -V OPTIONSFILE openldap24-client openldap24-client /var/db/ports/openldap24/options % cd ../openldap24-server % make -V UNIQUENAME -V LATEST_LINK -V OPTIONSFILE openldap24-server openldap24-server /var/db/ports/openldap24/options So only the value of UNIQUENAME differs before and after. However on inspection, openldap24-server and openldap24-client take different sets of options: -server takes a super-set of -client. So having a shared OPTIONSFILE doesn't make sense to me: either the OPTIONSFILEs have to be different, or -client has to present exactly the same options as -server, even if most of the settings would not affect the -client port. Cheers, Matthew --=20 Dr Matthew J Seaman MA, D.Phil. PGP: http://www.infracaninophile.co.uk/pgpkey --------------enig819360C2F8690D64C34DBDED Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.16 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/hwfEACgkQ8Mjk52CukIwDJwCcDcImZuutu+6KHlB/fiDnt7Lv VesAnij9q68gY/BJqeyg8y3HNigHi0Q3 =sXhG -----END PGP SIGNATURE----- --------------enig819360C2F8690D64C34DBDED--