From owner-freebsd-testing@FreeBSD.ORG Tue Jan 21 22:17:07 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 150CF7CD; Tue, 21 Jan 2014 22:17:07 +0000 (UTC) Received: from mail-pa0-x22b.google.com (mail-pa0-x22b.google.com [IPv6:2607:f8b0:400e:c03::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D64BE1F2B; Tue, 21 Jan 2014 22:17:06 +0000 (UTC) Received: by mail-pa0-f43.google.com with SMTP id rd3so9037119pab.2 for ; Tue, 21 Jan 2014 14:17:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:content-transfer-encoding:subject:mime-version:from :message-id:date:cc:to; bh=OmxRazhF5cjYWKdoIP3W6KGm6ZABWyowrS8ETfxhF44=; b=ShzYIqUgTrDS3zwBY6g5LJXZsNsEG24ioTQ0Tsk4wMv4duIVMuVOi3iRkrq57C+I/b ARQk17XyjgtlUGMd6VI26N05DkqUns41fC9vQ+hwayNtjYeTUXncjGGmQjMaj/GcFxqW l9Dt7DmYkgu5R8Rk4Q1pm7gOxd+pEWJOPi9xElQ9PzKI6+vS++wLcyqEb/5ad7NbifLe WlCMGS/54CpkOWuz3ewGbImReZ6GpsKVEZ0WhRvep2+yUGeY08nPhivJk1GwOcWFJRVM m+nUCoJe9OuQCmMTMx471c/2nnqWR/d5OafSfreRsUF1GK7IlR6rWL6gLXaZ3FLq40We /OjQ== X-Received: by 10.68.164.4 with SMTP id ym4mr27763024pbb.53.1390342626449; Tue, 21 Jan 2014 14:17:06 -0800 (PST) Received: from [10.0.2.128] ([64.14.143.130]) by mx.google.com with ESMTPSA id gn5sm15576404pbc.29.2014.01.21.14.17.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Jan 2014 14:17:05 -0800 (PST) Content-Type: multipart/mixed; boundary=Apple-Mail-5D1BF951-BCB4-4526-BB7B-9189041BF7B9 Content-Transfer-Encoding: 7bit Subject: Makefile.inc1.patch Mime-Version: 1.0 (1.0) From: Garrett Cooper Message-Id: Date: Tue, 21 Jan 2014 14:17:01 -0800 To: Alan Somers X-Mailer: iPhone Mail (11B554a) Cc: freebsd-testing@freebsd.org 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: Tue, 21 Jan 2014 22:17:07 -0000 --Apple-Mail-5D1BF951-BCB4-4526-BB7B-9189041BF7B9 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Hi all, The attached patch fixes/enhances the build so -DNO_TESTS is passed prop= erly 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 -D= WITH_TESTS failing on amd64. Cheers! -Garrett --Apple-Mail-5D1BF951-BCB4-4526-BB7B-9189041BF7B9 Content-Type: text/plain; name=Makefile.inc1.patch Content-Disposition: attachment; filename=Makefile.inc1.patch Content-Transfer-Encoding: 7bit diff --git a/Makefile.inc1 b/Makefile.inc1 index bf968a6..c5078f9 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -246,7 +247,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ 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 +257,12 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ 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 +415,8 @@ LIB32WMAKEFLAGS+= \ -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 +579,7 @@ _libraries: @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 "--------------------------------------------------------------" @@ -1877,7 +1893,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE} 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-5D1BF951-BCB4-4526-BB7B-9189041BF7B9--