Date: Mon, 10 Jan 2011 21:04:56 -0800 From: Doug Barton <dougb@FreeBSD.org> To: John Baldwin <jhb@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r217213 - head/lib/bind Message-ID: <4D2BE4F8.3030902@FreeBSD.org> In-Reply-To: <201101101433.18847.jhb@freebsd.org> References: <201101092347.p09NlB4M060802@svn.freebsd.org> <201101101433.18847.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D2BE4F8.3030902>