Date: Fri, 6 Nov 2020 17:24:02 +0100 From: Guido Falsi <madpilot@FreeBSD.org> To: Renato Botelho <garga@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r554143 - head/devel/git Message-ID: <7f621871-62ba-66f2-9917-4553c9bec54e@FreeBSD.org> In-Reply-To: <29a040dc-99d4-535e-2be4-14a80a4dd266@FreeBSD.org> References: <202011051704.0A5H4Jf8010250@repo.freebsd.org> <c565cd73-b915-9771-bbbd-708d5929f963@FreeBSD.org> <1ef8c98e-49e4-3aff-2886-4991d264ab2f@FreeBSD.org> <24edb45e-1e5a-fe05-30ef-36022e041dc1@FreeBSD.org> <29a040dc-99d4-535e-2be4-14a80a4dd266@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 06/11/20 17:01, Renato Botelho wrote: > On 06/11/20 11:36, Guido Falsi wrote: >> On 06/11/20 12:41, Renato Botelho wrote: >>> On 06/11/20 04:22, Guido Falsi wrote: >>>> On 05/11/20 18:04, Renato Botelho wrote: >>>>> @@ -76,6 +73,8 @@ OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS >>>>> PERL >>>>> .endif >>>>> OPTIONS_SUB= yes >>>>> + >>>>> +OPTIONS_FILE= ${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options >>>> >>>> I'm not sure why, but this is not working as expected IMHO. >>>> >>>> I noticed that, when using "poudriere options" and building with >>>> "poudriere bulk" the options file is ignored. poudsriere option >>>> continuously brings up the git dialog4ports screen and asks options >>>> proposing the defaults. The option file is correctly written but >>>> never read. poudriere bulk ignores it and builds with default options. >>> >>> I never used `poudriere options` before and indeed it seems to have a >>> bug there. For some reason I didn't understand yet poudriere >>> considers git (with default flavor) as a dependency of git (with lite >>> or gui flavor) and it's not correct. >>> >>> I tested a build with `poudriere testport -c -j JAIL devel/git@lite` >>> and changed some options. It worked as expected as you can see at [1]. >>> >>>> Also on the local machine running make config repeatedly in the port >>>> directory does the same: the dialog4ports sscreen comes up with >>>> default options each time and the options file is written but never >>>> read. >>> >>> I made lots of tests here and everything worked. The way I did it >>> was using: >>> >>> # make FLAVOR=(lite|gui) [config|showconfig|rmconfig] >>> >>> and I couldn't reproduce any issue. Every time selected options were >>> respected by showconfig, which reads file saved on config step. >>> >> >> Ok, I Think I see the problem. >> >> Did you try doing "make config" without passing any flavor? >> >> Ports framework does not define a default flavor for you, so if you >> don't specify one on the command line in some way, while it works most >> of the time, with git port it can't work, because the FLAVOR variable >> is undefined when it gets to expanding it in OPTIONS_FILE. >> >> If I run "make config" without a FLAVOR definition it misbehaves. >> >> I made a test adding a FLAVOR?= ${FLAVORS:[1]} line just below FLAVORS >> definition, and it now behaves correctly with "make config". It looks >> like it still misbehaves with poudriere options though, which is >> strange, I thought the FLAVOR trick would fix that too. I'm trying to >> understand why. >> > > Can you try this patch and see if it helps? > > https://bast.garga.net.br/files/git_options.diff > Yes, this one fixes the behaviour in ports directory and with poudriere options. Thanks! -- Guido Falsi <madpilot@FreeBSD.org>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7f621871-62ba-66f2-9917-4553c9bec54e>