Module Name: src
Committed By: jmcneill
Date: Fri Jan 14 16:04:50 UTC 2011
Modified Files:
src/external/mit/xorg/lib/libpciaccess: Makefile
Log Message:
only define HAVE_MTRR on x86
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libpciaccess/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.5 src/external/mit/xorg/lib/libpciaccess/Makefile:1.6
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.5 Wed Jan 12 19:04:19 2011
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Fri Jan 14 16:04:49 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/01/12 19:04:19 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2011/01/14 16:04:49 jmcneill Exp $
.include <bsd.own.mk>
@@ -17,8 +17,7 @@
common_vgaarb_stub.c \
netbsd_pci.c
-CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \
- -DHAVE_MTRR -DHAVE_ZLIB \
+CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include -DHAVE_ZLIB \
-DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H \
-DPCIIDS_PATH=\"${X11ROOTDIR}/share/pciids\"
@@ -32,6 +31,10 @@
LDADD+= -lpci -lz
DPADD+= ${LIBPCI} ${LIBZ}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+= -DHAVE_MTRR
+.endif
+
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
DPADD+= ${LIBI386}
