Module Name: src
Committed By: riz
Date: Mon Mar 7 18:46:09 UTC 2011
Modified Files:
src/external/mit/xorg/lib/libpciaccess [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1557):
xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c: revision 1.8
external/mit/xorg/lib/libpciaccess/Makefile: revision 1.5
external/mit/xorg/lib/libpciaccess/Makefile: revision 1.6
Fix compilation with HAVE_MTRR
HAVE_MMTR -> HAVE_MTRR
only define HAVE_MTRR on x86
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
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.1.2.2 src/external/mit/xorg/lib/libpciaccess/Makefile:1.1.2.3
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.1.2.2 Thu Sep 17 04:24:32 2009
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Mon Mar 7 18:46:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.2 2009/09/17 04:24:32 snj Exp $
+# $NetBSD: Makefile,v 1.1.2.3 2011/03/07 18:46:08 riz Exp $
.include <bsd.own.mk>
@@ -15,8 +15,7 @@
common_map.c \
netbsd_pci.c
-CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \
- -DHAVE_MMTR -DHAVE_ZLIB \
+CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include -DHAVE_ZLIB \
-DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_INTTYPES_H \
-DPCIIDS_PATH=\"${X11ROOTDIR}/share/pciids\"
@@ -30,6 +29,10 @@
LDADD+= -lpci
DPADD+= ${LIBPCI}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+= -DHAVE_MTRR
+.endif
+
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
DPADD+= ${LIBI386}
