Module Name: src
Committed By: bouyer
Date: Fri Apr 10 17:00:45 UTC 2009
Modified Files:
src/distrib/sets/lists/xserver: md.alpha
src/external/mit/xorg/server/drivers: Makefile
Log Message:
fix Xorg build on alpha:
- don't build/install drivers that are x86-specific
- add extra files to sets lists.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.15 src/distrib/sets/lists/xserver/md.alpha:1.16
--- src/distrib/sets/lists/xserver/md.alpha:1.15 Sat Feb 14 11:23:13 2009
+++ src/distrib/sets/lists/xserver/md.alpha Fri Apr 10 17:00:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.15 2009/02/14 11:23:13 abs Exp $
+# $NetBSD: md.alpha,v 1.16 2009/04/10 17:00:44 bouyer Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XalphaNetBSD -unknown- x11
./usr/X11R6/bin/XdecNetBSD -unknown- x11
@@ -9,11 +9,14 @@
./usr/X11R7/bin/pcitweak -unknown- xorg
./usr/X11R7/bin/scanpci -unknown- xorg
./usr/X11R7/bin/xorgconfig -unknown- xorg
+./usr/X11R7/lib/X11/Cards -unknown- xorg
./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg
./usr/X11R7/lib/X11/doc/README.fonts -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg
./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri.so -unknown- xorg
+./usr/X11R7/lib/modules/dri/mesa_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg
./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg
./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.26 src/external/mit/xorg/server/drivers/Makefile:1.27
--- src/external/mit/xorg/server/drivers/Makefile:1.26 Sat Feb 14 20:29:09 2009
+++ src/external/mit/xorg/server/drivers/Makefile Fri Apr 10 17:00:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/02/14 20:29:09 jmcneill Exp $
+# $NetBSD: Makefile,v 1.27 2009/04/10 17:00:45 bouyer Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -50,9 +50,38 @@
xf86-video-crime \
xf86-video-wsfb \
xf86-video-newport
-.elif ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_ARCH} == "x86_64"
-
+.elif ${MACHINE} == "alpha"
+SUBDIR+= \
+ xf86-video-apm \
+ xf86-video-ark \
+ xf86-video-ast \
+ xf86-video-ati \
+ xf86-video-chips \
+ xf86-video-cirrus \
+ xf86-video-cirrus_alpine \
+ xf86-video-cirrus_laguna \
+ xf86-video-glint \
+ xf86-video-i128 \
+ xf86-video-i740 \
+ xf86-video-imstt \
+ xf86-video-mach64 \
+ xf86-video-mga \
+ xf86-video-nv \
+ xf86-video-r128 \
+ xf86-video-radeon \
+ xf86-video-radeonhd \
+ xf86-video-s3 \
+ xf86-video-s3virge \
+ xf86-video-savage \
+ xf86-video-siliconmotion \
+ xf86-video-sis \
+ xf86-video-tdfx \
+ xf86-video-tga \
+ xf86-video-trident \
+ xf86-video-tseng \
+ xf86-video-vga \
+ xf86-video-wsfb
+.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
