ports/105535: [Maintainer Update] cad/brlcad fix for compile failure on sparc64

[Erik Greenwald]

>Number:         105535
>Category:       ports
>Synopsis:       [Maintainer Update]  cad/brlcad  fix for compile failure on sparc64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 14 18:10:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Erik Greenwald
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD fenris 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Tue Oct 10 16:58:15 EDT 2006 erik at fenris:/usr/obj/usr/src/sys/FENRIS i386

>Description:

Compile failed on fbsd7/sparc64 due to some inadequate preprocessor fu.
Hopefully this fixes it (I cannot test on sparc64, but have made sure things
still work on amd64 and ia32. Can anyone doublecheck this on fbsd7/sparc64 for
me?). New file, so files/patch-include_machine.h will need a cvs add.

Has already been committed to the BRL-CAD repository (14.21).
http://brlcad.cvs.sourceforge.net/brlcad/brlcad/include/machine.h?view=log

Thanks!

>How-To-Repeat:
>Fix:

--- cad_brlcad.patch begins here ---
Index: cad/brlcad/files/patch-include_machine.h
===================================================================
RCS file: cad/brlcad/files/patch-include_machine.h
diff -N cad/brlcad/files/patch-include_machine.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ cad/brlcad/files/patch-include_machine.h	14 Nov 2006 18:02:15 -0000
@@ -0,0 +1,31 @@
+Index: include/machine.h
+===================================================================
+RCS file: /cvsroot/brlcad/brlcad/include/machine.h,v
+retrieving revision 14.20
+diff -u -r14.20 machine.h
+--- include/machine.h	18 Sep 2006 05:24:07 -0000	14.20
++++ include/machine.h	14 Nov 2006 18:00:33 -0000
+@@ -611,7 +611,8 @@
+ 
+ #endif
+ 
+-#if defined(__sparc64__)
++/* TODO: should this be looking for solaris/sunos tags? */
++#if defined(__sparc64__) && !defined(__FreeBSD__)
+ /********************************
+  *                              *
+  *      Sparc 64       		*
+@@ -702,11 +703,11 @@
+ # define LOCAL		auto		/* static|auto, for serial|parallel cpu */
+ 
+ /* amd64 */
+-# if defined(__x86_64__)
++# if defined(__x86_64__) || defined(__sparc64__) || defined(__ia64__)
+ #  define BITV_SHIFT	6
+ #  define MAX_PSW		256
+ /* ia32 */
+-# elif !defined(__ia64__) && !defined(__x86_64__) && !defined(__sparc64__)
++# else
+ #  define BITV_SHIFT	5
+ #  define MAX_PSW	16
+ # endif
--- cad_brlcad.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: