Re: svn commit: r217213 - head/lib/bind

2011-01-11 Thread Warner Losh
On 01/10/2011 22:04, Doug Barton wrote: 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} == "am

Re: svn commit: r217213 - head/lib/bind

2011-01-11 Thread Warner Losh
On 01/11/2011 06:47, John Baldwin wrote: On Tuesday, January 11, 2011 12:04:56 am Doug Barton wrote: 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. 209886 did not use MACHINE_CPUA

Re: svn commit: r217213 - head/lib/bind

2011-01-11 Thread Doug Barton
On 01/11/2011 11:00, John Baldwin wrote: .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" And_this_ line is still MACHINE_ARCH here, which is wrong. This should use MACHINE_CPUARCH. That is the only line I have been talking about the entire time. Yep, sorry, I wasn't kidding w

Re: svn commit: r217213 - head/lib/bind

2011-01-11 Thread John Baldwin
On Tuesday, January 11, 2011 1:49:10 pm Doug Barton wrote: > On 01/11/2011 05:47, John Baldwin wrote: > > On Tuesday, January 11, 2011 12:04:56 am Doug Barton wrote: > >> On 01/10/2011 11:33, John Baldwin wrote: > >>> On Sunday, January 09, 2011 6:47:11 pm Doug Barton wrote: > >> > # Use th

Re: svn commit: r217213 - head/lib/bind

2011-01-11 Thread Doug Barton
On 01/11/2011 05:47, John Baldwin wrote: On Tuesday, January 11, 2011 12:04:56 am Doug Barton wrote: 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_CPUA

Re: svn commit: r217213 - head/lib/bind

2011-01-11 Thread John Baldwin
On Tuesday, January 11, 2011 12:04:56 am Doug Barton wrote: > 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

Re: svn commit: r217213 - head/lib/bind

2011-01-10 Thread Doug Barton
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

Re: svn commit: r217213 - head/lib/bind

2011-01-10 Thread Warner Losh
On 01/10/2011 12:33, John Baldwin wrote: On Sunday, January 09, 2011 6:47:11 pm Doug Barton wrote: Author: dougb Date: Sun Jan 9 23:47:11 2011 New Revision: 217213 URL: http://svn.freebsd.org/changeset/base/217213 Log: Revert part of r217071 so that us mere mortals can clearly see what t

Re: svn commit: r217213 - head/lib/bind

2011-01-10 Thread John Baldwin
On Sunday, January 09, 2011 6:47:11 pm Doug Barton wrote: > Author: dougb > Date: Sun Jan 9 23:47:11 2011 > New Revision: 217213 > URL: http://svn.freebsd.org/changeset/base/217213 > > Log: > Revert part of r217071 so that us mere mortals can clearly see > what this bit of code is intended to

svn commit: r217213 - head/lib/bind

2011-01-09 Thread Doug Barton
Author: dougb Date: Sun Jan 9 23:47:11 2011 New Revision: 217213 URL: http://svn.freebsd.org/changeset/base/217213 Log: Revert part of r217071 so that us mere mortals can clearly see what this bit of code is intended to do. :) Approved by: imp Modified: head/lib/bind/config.mk Modif