Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/lib/libpciaccess only define HAVE_MTRR on x86



details:   https://anonhg.NetBSD.org/src/rev/5bf62bda5a0b
branches:  trunk
changeset: 760865:5bf62bda5a0b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jan 14 16:04:49 2011 +0000

description:
only define HAVE_MTRR on x86

diffstat:

 external/mit/xorg/lib/libpciaccess/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 37e16172eee2 -r 5bf62bda5a0b external/mit/xorg/lib/libpciaccess/Makefile
--- a/external/mit/xorg/lib/libpciaccess/Makefile       Fri Jan 14 14:21:36 2011 +0000
+++ b/external/mit/xorg/lib/libpciaccess/Makefile       Fri Jan 14 16:04:49 2011 +0000
@@ -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}



Home | Main Index | Thread Index | Old Index