From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 14 18:10:31 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C195116A403 for ; Tue, 14 Nov 2006 18:10:31 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13E9243D78 for ; Tue, 14 Nov 2006 18:10:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAEIAJ9X083221 for ; Tue, 14 Nov 2006 18:10:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAEIAJTq083220; Tue, 14 Nov 2006 18:10:19 GMT (envelope-from gnats) Resent-Date: Tue, 14 Nov 2006 18:10:19 GMT Resent-Message-Id: <200611141810.kAEIAJTq083220@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Erik Greenwald Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C59116A416 for ; Tue, 14 Nov 2006 18:09:21 +0000 (UTC) (envelope-from erik@smluc.org) Received: from phoenix.smluc.org (phoenix.smluc.org [12.28.48.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DA7C43D5D for ; Tue, 14 Nov 2006 18:09:20 +0000 (GMT) (envelope-from erik@smluc.org) Received: by phoenix.smluc.org (Postfix, from userid 1000) id C277E1CE55; Tue, 14 Nov 2006 12:10:23 -0600 (CST) Message-Id: <20061114181023.C277E1CE55@phoenix.smluc.org> Date: Tue, 14 Nov 2006 12:10:23 -0600 (CST) From: Erik Greenwald To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: erikg@arl.army.mil Subject: ports/105535: [Maintainer Update] cad/brlcad fix for compile failure on sparc64 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Erik Greenwald List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2006 18:10:31 -0000 >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@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: