Date: Thu, 23 Jan 2014 12:53:31 -0800 From: Garrett Cooper <yaneurabeya@gmail.com> To: Alan Somers <asomers@freebsd.org> Cc: "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org>, "Simon J. Gerraty" <sjg@freebsd.org> Subject: Re: Makefile.inc1.patch Message-ID: <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> In-Reply-To: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> References: <B4D2A908-715F-484F-8028-A1F38884AF3F@gmail.com> <CAOtMX2jQ24JCR2Ct8YKob4MKcHWMhVVv5XG-1usoPWqEOA2OQg@mail.gmail.com> <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_BD061265-5FF4-416C-A559-2A84005BC8B5
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=windows-1252
On Jan 22, 2014, at 8:34 AM, Garrett Cooper <yaneurabeya@gmail.com> =
wrote:
>=20
>> On Jan 22, 2014, at 7:42, Alan Somers <asomers@freebsd.org> wrote:
>>=20
>>> 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 with -DWITH_TESTS failing on amd64.
>>> Cheers!
>>> -Garrett
>>=20
>> The patch doesn't work for me. I get the following error during
>> buildworld during stage 4.4.
>=20
> ...
>=20
> Oh yeah... It's that chicken and egg issue due to ATF now being =
controlled 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 =
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} !=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 =
github fork so it=92ll be easier to spot if you diff it against my tree.
Thanks!
-Garrett
--Apple-Mail=_BD061265-5FF4-416C-A559-2A84005BC8B5
Content-Disposition: attachment;
filename=Makefile.inc1.patch
Content-Type: application/octet-stream;
name="Makefile.inc1.patch"
Content-Transfer-Encoding: 7bit
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 260925)
+++ Makefile.inc1 (working copy)
@@ -246,7 +246,7 @@
SSP_CFLAGS= \
-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -256,12 +256,12 @@
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
-DNO_LINT \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- -DWITHOUT_GDB
+ -DWITHOUT_GDB -DNO_TESTS
# kernel-tools stage
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -414,7 +414,8 @@
-DLIBRARIES_ONLY \
-DNO_CPU_CFLAGS \
-DNO_CTF \
- -DNO_LINT
+ -DNO_LINT \
+ -DNO_TESTS
LIB32WMAKE= ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
-DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
@@ -569,7 +570,7 @@
@echo "--------------------------------------------------------------"
${_+_}cd ${.CURDIR}; \
${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
- -DWITHOUT_MAN -DNO_PROFILE libraries
+ -DWITHOUT_MAN -DNO_PROFILE -DNO_TESTS libraries
_depend:
@echo
@echo "--------------------------------------------------------------"
@@ -1501,7 +1502,11 @@
${_secure_lib_libcrypto} ${_lib_libldns} \
${_secure_lib_libssh} ${_secure_lib_libssl}
-.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
_lib_atf= lib/atf
.endif
@@ -1877,7 +1882,7 @@
NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
- -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
+ -DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_TESTS -DNO_WARNS \
TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
CPUTYPE=${XDEV_CPUTYPE}
--Apple-Mail=_BD061265-5FF4-416C-A559-2A84005BC8B5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9775878D-91AB-4BE4-ADFA-32D8DB582AA6>