UltraSparc III still busted - X server causes hang, current panics at boot

[Marius Strobl]

On Wed, Mar 25, 2009 at 03:03:24PM +0100, Marius Strobl wrote:
> On Wed, Mar 25, 2009 at 08:25:14AM -0500, Mark Linimon wrote:
> > Right now x11 isn't buildable on sparc64-current no matter what the
> > machine (e.g. US-II as well).  We are in the middle of a great deal
> > of ports churn for various reasons.  I have asked for some help from
> > various port maintainers to fix the problems.  However, not everyone
> > has access to a sparc64 machine for testing.
> > 
> 
> FYI, with ports as of 20090322 the only problem hit compile-
> wise when installing xorg on a V210 running r189533 was that
> xorg-drivers depends on xf86-video-intel, which is marked
> amd64 and i386 only. This was with WITHOUT_HAL defined though.
> X.Org 7.4 might have additional problems on a more recent
> CURRENT, which are unlikely to be sparc64-specific then
> however. Could you please commit the patch below using your
> portmngr-hat?
> 

Hrm, thinking about it the version below is probably more
appropriate as it also takes other architectures like
powerpc into account.

Marius

Index: Makefile
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/ports/x11-drivers/xorg-drivers/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile	23 Jan 2009 16:28:02 -0000	1.14
+++ Makefile	25 Mar 2009 14:10:56 -0000
@@ -25,7 +25,6 @@
 .endif
 
 VIDEO_ON=	ati \
-		intel \
 		mach64 \
 		nv \
 		r128 \
@@ -38,6 +37,10 @@
 VIDEO_ON+=	openchrome
 .endif
 
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
+VIDEO_ON+=	intel
+.endif
+
 VIDEO_OFF=	apm ark \
 		chips cirrus cyrix \
 		dummy \