svn commit: r217071 - head/lib/bind

Warner Losh imp at FreeBSD.org
Thu Jan 6 21:07:51 UTC 2011


Author: imp
Date: Thu Jan  6 21:07:51 2011
New Revision: 217071
URL: http://svn.freebsd.org/changeset/base/217071

Log:
  Make this work on big endian MIPS, while not breaking it for small
  endian mips.  This will also make it work automatically on all future
  big endian platforms.

Modified:
  head/lib/bind/config.mk

Modified: head/lib/bind/config.mk
==============================================================================
--- head/lib/bind/config.mk	Thu Jan  6 21:04:00 2011	(r217070)
+++ head/lib/bind/config.mk	Thu Jan  6 21:07:51 2011	(r217071)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
+.include <bsd.endian.mk>
 
 # BIND version number
 .if defined(BIND_DIR) && exists(${BIND_DIR}/version)
@@ -45,7 +46,7 @@ CFLAGS+=	-DOPENSSL
 CFLAGS+=	-DUSE_MD5
 
 # Endianness
-.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_CPUARCH} == "sparc64"
+.if ${TARGET_ENDIANNESS} == 4321
 CFLAGS+=	-DWORDS_BIGENDIAN
 .endif
 
@@ -64,11 +65,7 @@ CFLAGS+=	-I${LIB_BIND_DIR}
 .endif
 
 # Use the right version of the atomic.h file from lib/isc
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-ISC_ATOMIC_ARCH=	x86_32
-.else
-ISC_ATOMIC_ARCH=	${MACHINE_CPUARCH}
-.endif
+ISC_ATOMIC_ARCH=${MACHINE_CPUARCH:S/i386/x86_32/:S/amd64/x86_32/}
 
 # Optional features
 .if ${MK_BIND_LARGE_FILE} == "yes"
@@ -121,4 +118,3 @@ CRYPTO_LDADD=	-lcrypto
 
 PTHREAD_DPADD=	${LIBPTHREAD}
 PTHREAD_LDADD=	-lpthread
-


More information about the svn-src-all mailing list