From owner-svn-src-head@FreeBSD.ORG Tue Jan 11 05:04:59 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18A681065675 for ; Tue, 11 Jan 2011 05:04:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with ESMTP id B85598FC1C for ; Tue, 11 Jan 2011 05:04:58 +0000 (UTC) Received: (qmail 22733 invoked by uid 399); 11 Jan 2011 05:04:57 -0000 Received: from localhost (HELO doug-optiplex.ka9q.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 11 Jan 2011 05:04:57 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4D2BE4F8.3030902@FreeBSD.org> Date: Mon, 10 Jan 2011 21:04:56 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.13) Gecko/20101210 Thunderbird/3.1.7 MIME-Version: 1.0 To: John Baldwin References: <201101092347.p09NlB4M060802@svn.freebsd.org> <201101101433.18847.jhb@freebsd.org> In-Reply-To: <201101101433.18847.jhb@freebsd.org> X-Enigmail-Version: 1.1.2 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r217213 - head/lib/bind X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jan 2011 05:04:59 -0000 On 01/10/2011 11:33, John Baldwin wrote: > On Sunday, January 09, 2011 6:47:11 pm Doug Barton wrote: >> # Use the right version of the atomic.h file from lib/isc >> -ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/} >> +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" > > This should use MACHINE_CPUARCH instead of MACHINE_ARCH? When this block was first written I don't think _CPUARCH existed at all, and/or had not been MFC'ed. Subsequently, nwhitehorn made the change in r209886 to use _CPUARCH in both places, however the diff from Warner's commit in r217071 (which is what I based my change on) clearly showed _ARCH (http://svn.freebsd.org/viewvc/base/head/lib/bind/config.mk?r1=209886&r2=217071). So, I'm not sure where svn went sideways there, but it's definitely "odd." I have no objection to putting it back to the state that it was in at r209886, although frankly less diffs to RELENG_[78] without good reason make my life easier. Doug PS, this is just another reason why I prefer pre-commit review when convenient ... >> +ISC_ATOMIC_ARCH= x86_32 >> +.else >> +ISC_ATOMIC_ARCH= ${MACHINE_CPUARCH} >> +.endif >> >> # Optional features >> .if ${MK_BIND_LARGE_FILE} == "yes" >> > -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/