Makefile.inc1.patch

Julio Merino julio at meroh.net
Fri Jan 24 23:36:16 UTC 2014


On Thu, Jan 23, 2014 at 3:53 PM, Garrett Cooper <yaneurabeya at gmail.com> wrote:
>         Here’s the working patch. The difference between this one and the prior version is that you have to explicitly override -DNO_TESTS when building lib/atf* (Simon: do you have any comments?):
>
> -.if ${MK_TESTS} != "no"
> +.if defined(WITH_ATF) || ${MK_TESTS} != "no"
> +# Make sure WITH_ATF overrules -DNO_TESTS
> +.if !defined(WITH_ATF)
> +MAKE+=         -DWITH_ATF
> +.endif

Hmm... but this is only necessary to support building the lib32
versions of libatf, correct?  Because otherwise, the libraries are
already being built fine as part of the library building stage.

Also, I'd recommend not using the WITH_ATF name here because this is
not a variable supposed to be set by the users in src.conf and can be
easily confused by others. It's an internal knob to support the
recursion done by Makefile.inc1, so a more obscure name would suit.

Anyway, I see this has been committed now. Please don't forget to pull
any changes up to stable/10!

-- 
Julio Merino / @jmmv


More information about the freebsd-testing mailing list