Date: Fri, 24 Jan 2014 18:35:53 -0500 From: Julio Merino <julio@meroh.net> 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: <CADyfeQUrijVPQpgC2nRWfbVyeLweAHxKb5yUwg7kCmjYh5nE3A@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 3:53 PM, Garrett Cooper <yaneurabeya@gmail.com> wro= te: > 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 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! --=20 Julio Merino / @jmmv
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADyfeQUrijVPQpgC2nRWfbVyeLweAHxKb5yUwg7kCmjYh5nE3A>