diff options
| author | Shaun Amott <shaun@FreeBSD.org> | 2006-12-05 21:45:12 +0000 |
|---|---|---|
| committer | Shaun Amott <shaun@FreeBSD.org> | 2006-12-05 21:45:12 +0000 |
| commit | 3834abdd0d1ba4f02c2ea34d4752e771a69717ca (patch) | |
| tree | 710014c1cd0d04a413cb80c874ffcde69dbac61e /cad/brlcad | |
| parent | dccbd9e5a98f2261e80ac52331dd7faf972a82d4 (diff) | |
| download | ports-3834abdd0d1ba4f02c2ea34d4752e771a69717ca.tar.gz ports-3834abdd0d1ba4f02c2ea34d4752e771a69717ca.zip | |
- Fix build on sparc64. [1]
- Respect ${X11BASE}. [2]
PR: ports/105535 [1], ports/106245 [2]
Submitted by: Erik Greenwald <erik@smluc.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=178973
Diffstat (limited to 'cad/brlcad')
| -rw-r--r-- | cad/brlcad/Makefile | 3 | ||||
| -rw-r--r-- | cad/brlcad/files/patch-include_machine.h | 31 |
2 files changed, 34 insertions, 0 deletions
diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile index 326ecca98b10..c041d453685d 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -175,6 +175,9 @@ CONFIGURE_ARGS+= --enable-optimized .endif .endif +post-patch: + ${REINPLACE_CMD} "s+/usr/X11R6+${X11BASE}+" ${WRKSRC}/configure + pre-install: ${CP} ${FILESDIR}/mged.sh ${WRKSRC} ${REINPLACE_CMD} -e 's+%%BRLCAD_ROOT%%+${PREFIX}+g;' \ diff --git a/cad/brlcad/files/patch-include_machine.h b/cad/brlcad/files/patch-include_machine.h new file mode 100644 index 000000000000..bab5ec121661 --- /dev/null +++ b/cad/brlcad/files/patch-include_machine.h @@ -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 |