Date: Thu, 23 Jan 2014 13:56:06 -0700 From: Alan Somers <asomers@freebsd.org> To: Garrett Cooper <yaneurabeya@gmail.com> Cc: "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org>, "Simon J. Gerraty" <sjg@freebsd.org> Subject: Re: Makefile.inc1.patch Message-ID: <CAOtMX2hhW9wrN0b4UCKFRS79ata45c-vczMuHMmWcZTic_FeHw@mail.gmail.com> In-Reply-To: <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> References: <B4D2A908-715F-484F-8028-A1F38884AF3F@gmail.com> <CAOtMX2jQ24JCR2Ct8YKob4MKcHWMhVVv5XG-1usoPWqEOA2OQg@mail.gmail.com> <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Jan 23, 2014 at 1:53 PM, Garrett Cooper <yaneurabeya@gmail.com> wro=
te:
> On Jan 22, 2014, at 8:34 AM, Garrett Cooper <yaneurabeya@gmail.com> wrote=
:
>
>>
>>> On Jan 22, 2014, at 7:42, Alan Somers <asomers@freebsd.org> wrote:
>>>
>>>> On Tue, Jan 21, 2014 at 3:17 PM, Garrett Cooper <yaneurabeya@gmail.com=
> wrote:
>>>> Hi all,
>>>> The attached patch fixes/enhances the build so -DNO_TESTS is passed =
properly through various sections of the build that don't require tests in =
order to build/install. This should also fix Alan's recent reported issue w=
ith -DWITH_TESTS failing on amd64.
>>>> Cheers!
>>>> -Garrett
>>>
>>> The patch doesn't work for me. I get the following error during
>>> buildworld during stage 4.4.
>>
>> ...
>>
>> Oh yeah... It's that chicken and egg issue due to ATF now being controll=
ed by MK_TESTS=3D=3Dyes... There's more to this patch I need to provide you=
in order for things to work...
>
> Here=92s the working patch. The difference between this one and t=
he prior version is that you have to explicitly override -DNO_TESTS when bu=
ilding lib/atf* (Simon: do you have any comments?):
>
> -.if ${MK_TESTS} !=3D "no"
> +.if defined(WITH_ATF) || ${MK_TESTS} !=3D "no"
> +# Make sure WITH_ATF overrules -DNO_TESTS
> +.if !defined(WITH_ATF)
> +MAKE+=3D -DWITH_ATF
> +.endif
>
> I unrolled most of the local changes to Makefile.inc1 on my githu=
b fork so it=92ll be easier to spot if you diff it against my tree.
> Thanks!
> -Garrett
Shouldn't that be "WITH_TESTS" instead of "WITH_ATF"? Those options
got combined awhile back.
-Alan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAOtMX2hhW9wrN0b4UCKFRS79ata45c-vczMuHMmWcZTic_FeHw>