From owner-svn-src-head@FreeBSD.ORG  Mon Jan 10 20:03:25 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 7DF09106566C;
	Mon, 10 Jan 2011 20:03:25 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 51E2D8FC08;
	Mon, 10 Jan 2011 20:03:25 +0000 (UTC)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id 0DE4D46B4C;
	Mon, 10 Jan 2011 15:03:25 -0500 (EST)
Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id D9EEC8A01D;
	Mon, 10 Jan 2011 15:03:22 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Doug Barton <dougb@freebsd.org>
Date: Mon, 10 Jan 2011 14:33:18 -0500
User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; )
References: <201101092347.p09NlB4M060802@svn.freebsd.org>
In-Reply-To: <201101092347.p09NlB4M060802@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201101101433.18847.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6
	(bigwig.baldwin.cx); Mon, 10 Jan 2011 15:03:23 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham
	version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Jan 2011 20:03:25 -0000

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 do. :)
>   
>   Approved by:	imp
> 
> Modified:
>   head/lib/bind/config.mk
> 
> Modified: head/lib/bind/config.mk
> 
==============================================================================
> --- head/lib/bind/config.mk	Sun Jan  9 23:46:24 2011	(r217212)
> +++ head/lib/bind/config.mk	Sun Jan  9 23:47:11 2011	(r217213)
> @@ -65,7 +65,11 @@ CFLAGS+=	-I${LIB_BIND_DIR}
>  .endif
>  
>  # 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?

> +ISC_ATOMIC_ARCH=	x86_32
> +.else
> +ISC_ATOMIC_ARCH=	${MACHINE_CPUARCH}
> +.endif
>  
>  # Optional features
>  .if ${MK_BIND_LARGE_FILE} == "yes"
> 

-- 
John Baldwin