From owner-freebsd-testing@FreeBSD.ORG Fri Jan 24 23:36:16 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 44DA2D68 for ; Fri, 24 Jan 2014 23:36:16 +0000 (UTC) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BDE6314A5 for ; Fri, 24 Jan 2014 23:36:15 +0000 (UTC) Received: by mail-la0-f48.google.com with SMTP id mc6so3056421lab.35 for ; Fri, 24 Jan 2014 15:36:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type:content-transfer-encoding; bh=J6k0HXBjW/XTDeMt5VqsC/RLL+NloHCBJxkAK5CW8Qk=; b=hhunBvHqDH3Zgv6Z8IAmv2CPsfkFV3FB3SFvxHNgBqeuVYAMYxxxjRnrHIutGXm7oD b2xb1fVf2NhIN6DSvdPqAfJ86Ctfy1RBhl5tGbe/Fd9rjP5QDzA1WUQhcg4x+RIkppnJ tGmxaar20yRc7QJE+PNwPWIVLZJp7W93JOki9LS7N8uwB6rtUSgBPNgQUdbdBRt3UiGv VYweJ6CRYBHvqzWxM+fySBdNghTCceVauibRAefoJuRZD9V7Sm1VgLpZby1CeFzobVDh i+rCOXuM7e1lBafN0RmLSskbMA+Vk06n92AKOMzMYSNtH4v83uHXUP9zLYIoyFkP+9rE q3/Q== X-Gm-Message-State: ALoCoQnxjIc7c3RK9yKZ3JsBEDb1KTg4GC2E9DCTZxzs3uaOvG7JsSlyXt6pN29/++z8v9bI1ZTL X-Received: by 10.152.229.225 with SMTP id st1mr10660392lac.2.1390606573786; Fri, 24 Jan 2014 15:36:13 -0800 (PST) MIME-Version: 1.0 Received: by 10.112.129.101 with HTTP; Fri, 24 Jan 2014 15:35:53 -0800 (PST) X-Originating-IP: [2620:0:1003:100e:15ba:18e2:3e40:cdd2] In-Reply-To: <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> References: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> From: Julio Merino Date: Fri, 24 Jan 2014 18:35:53 -0500 Message-ID: Subject: Re: Makefile.inc1.patch To: Garrett Cooper Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable 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: Fri, 24 Jan 2014 23:36:16 -0000 On Thu, Jan 23, 2014 at 3:53 PM, Garrett Cooper 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