From naddy@mips.inka.de  Sat Aug 26 14:47:02 2000
Return-Path: <naddy@mips.inka.de>
Received: from mail.inka.de (quechua.inka.de [212.227.14.2])
	by hub.freebsd.org (Postfix) with ESMTP id BB6B037B422
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 26 Aug 2000 14:47:00 -0700 (PDT)
Received: from bigeye.mips.inka.de (uucp@)
	by mail.inka.de with local-bsmtp 
	id 13Snmw-0005Z7-00; Sat, 26 Aug 2000 23:46:54 +0200
Received: (from naddy@localhost)
	by bigeye.mips.inka.de (8.9.3/8.9.3) id XAA89232;
	Sat, 26 Aug 2000 23:38:45 +0200 (CEST)
	(envelope-from naddy)
Message-Id: <200008262138.XAA89232@bigeye.mips.inka.de>
Date: Sat, 26 Aug 2000 23:38:45 +0200 (CEST)
From: Christian Weisgerber <naddy@mips.inka.de>
Reply-To: naddy@mips.inka.de
To: FreeBSD-gnats-submit@freebsd.org
Subject: tdfx module doesn't build
X-Send-Pr-Version: 3.2

>Number:         20873
>Category:       alpha
>Synopsis:       tdfx module doesn't build
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-alpha
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 26 14:50:01 PDT 2000
>Closed-Date:    Sun Aug 27 20:18:29 PDT 2000
>Last-Modified:  Sun Aug 27 20:18:48 PDT 2000
>Originator:     Christian Weisgerber
>Release:        FreeBSD 5.0-CURRENT alpha
>Organization:
>Environment:

"make buildkernel KERNEL=GENERIC" during 4.1->5.0 update
Presumably this applies to builds on 5.0-CURRENT, too.

>Description:

The tdfx module doesn't build on alpha.

By default, TDFX_LINUX is defined.  This triggers the inclusion of
<machine/../linux/linux.h> and <machine/../linux/linux_proto.h>
which apparently don't exist on alpha.

sys/modules/3dfx/Makefile       # defines TDFX_LINUX
sys/dev/tdfx/tdfx_pci.c         # includes tdfx_linux.h ifdef TDFX_LINUX
sys/dev/tdfx/tdfx_linux.h       # includes machine/../linux/* headers

>How-To-Repeat:

>Fix:

--- sys/modules/3dfx/Makefile.orig	Thu Aug 24 17:09:46 2000
+++ sys/modules/3dfx/Makefile	Thu Aug 24 17:11:10 2000
@@ -9,9 +9,11 @@
 
 CLEANFILES=    pci.h
 
+.if ${MACHINE_ARCH} == "i386"
 # This line enables linux ioctl handling by default
 # comment out if you don't want it
 TDFX_OPTS=     "\#define TDFX_LINUX"
+.endif
 
 # Uncomment this for debugging messages
 #CFLAGS+=      -DDEBUG

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: marcel 
State-Changed-When: Sun Aug 27 20:18:29 PDT 2000 
State-Changed-Why:  
Patch committed. Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=20873 
>Unformatted:
