Makefile.inc1.patch

Simon J. Gerraty sjg at juniper.net
Thu Jan 23 21:48:43 UTC 2014


[+brooks]

On Thu, 23 Jan 2014 12:53:31 -0800, Garrett Cooper writes:
>	Here=92s 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?):

Not crazy about frobbing ${MAKE}

>
>-.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

Would it make sense to have ATF or TESTS depend on the other?

As is that can't be done, since one cannot always safely include
bsd.own.mk from the tree.

I'd really like to see the WITH[OUT]_ processing separated to its own
makefile (I use options.mk) so that it can always be safely used - even
with an option list specific to a given makefile.

The semantics in bsd.own.mk are quite broken and result in a lot of complex
dancing to keep things working.

>
>	I unrolled most of the local changes to Makefile.inc1 on my =
>github fork so it=92ll be easier to spot if you diff it against my tree.
>Thanks!
>-Garrett



More information about the freebsd-testing mailing list