From owner-freebsd-testing@FreeBSD.ORG Thu Jan 23 20:53:37 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FA61183; Thu, 23 Jan 2014 20:53:37 +0000 (UTC) Received: from mail-pb0-x22e.google.com (mail-pb0-x22e.google.com [IPv6:2607:f8b0:400e:c01::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 524C719C3; Thu, 23 Jan 2014 20:53:37 +0000 (UTC) Received: by mail-pb0-f46.google.com with SMTP id um1so2310518pbc.5 for ; Thu, 23 Jan 2014 12:53:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=fiGw63QLMskZaBCYlYF85s/3VkI9XqoDSbBDxYa6cXY=; b=Ij1Jh1638aIXlwVVS5HYcf56ONVnlDSEWoAtfxMEDMXjmGRyl6Kn/TJ2BApO2e+jM6 PtRMm3aOvNVRpwSGYrRl5oODtVf8cebWnCWj9ybKRBMKwyIHP7+CJTloGxNxaeUPL9Hb xupAKjndugbHbUfxd8+VN6PpVmshHwG0m/x4JDf6T5VNM7ucGhOH/+89WZjTVaJc00Bc tQuupIt3y13/rvU4CjMev9es/6rqyfi37IHdzQJdmR7pIis+JbKKA9BOuUJSYQ3G5Lj6 abB1pU8EFkERL0ohGCjYM8At6pj9D2Qq5K1OIetrAhAH+fUNHf1lBsnG/70fqxbiy8fv NRJw== X-Received: by 10.68.134.98 with SMTP id pj2mr10273497pbb.110.1390510416886; Thu, 23 Jan 2014 12:53:36 -0800 (PST) Received: from fuji.zcorp.zonarsystems.com ([64.14.143.130]) by mx.google.com with ESMTPSA id un5sm65763032pab.3.2014.01.23.12.53.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 12:53:35 -0800 (PST) Content-Type: multipart/mixed; boundary="Apple-Mail=_BD061265-5FF4-416C-A559-2A84005BC8B5" Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: Makefile.inc1.patch From: Garrett Cooper In-Reply-To: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> Date: Thu, 23 Jan 2014 12:53:31 -0800 Message-Id: <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> References: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> To: Alan Somers X-Mailer: Apple Mail (2.1827) Cc: "freebsd-testing@freebsd.org" , "Simon J. Gerraty" X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2014 20:53:37 -0000 --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 = wrote: >=20 >> On Jan 22, 2014, at 7:42, Alan Somers wrote: >>=20 >>> On Tue, Jan 21, 2014 at 3:17 PM, Garrett Cooper = 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--