Module Name: src
Committed By: macallan
Date: Fri Jan 14 19:44:04 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libpciaccess: Makefile
Log Message:
don't blindly enable memory and IO access on macppc
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/external/mit/xorg/lib/libpciaccess/Makefile:1.10
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.9 Thu May 16 01:22:36 2019
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Fri Jan 14 19:44:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/05/16 01:22:36 christos Exp $
+# $NetBSD: Makefile,v 1.10 2022/01/14 19:44:04 macallan Exp $
.include <bsd.own.mk>
@@ -31,6 +31,11 @@ PKGDIST= ${LIB}
LIBDPLIBS+= pci ${NETBSDSRCDIR}/lib/libpci \
z ${NETBSDSRCDIR}/lib/libz
+# do not blindly enable memory and IO access on macppc
+.if ${MACHINE} == "macppc"
+CPPFLAGS+= -DAVOID_DEVICE_ENABLE
+.endif
+
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
CPPFLAGS+= -DHAVE_MTRR
LIBDPLIBS+= ${XORG_MACHINE_ARCH:U${MACHINE_ARCH}} ${NETBSDSRCDIR}/lib/libarch