ports/144294: [PATCH] java/openjdk6: Unbreak build on i386

[Greg Larkin]

>Number:         144294
>Category:       ports
>Synopsis:       [PATCH] java/openjdk6: Unbreak build on i386
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 25 19:10:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Greg Larkin
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD fbsd70.entropy.prv 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008
>Description:
The i386 build errored out on the file hotspot/src/share/vm/adlc/adlparse.cpp
with the following message:

  sorry, unimplemented: 64-bit mode not compiled in

The compiler flags indicated that the build was configured for amd64 instead
of i386.

Port maintainer (openjdk at getsnappy.com) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:

  cd /usr/ports/java/openjdk6 && make install clean

on the i386 platform

>Fix:

--- openjdk6-b17_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/java/openjdk6.orig/Makefile /usr/ports/java/openjdk6/Makefile
--- /usr/ports/java/openjdk6.orig/Makefile	2010-02-25 10:50:04.596707000 -0500
+++ /usr/ports/java/openjdk6/Makefile	2010-02-25 12:40:26.980503126 -0500
@@ -80,9 +80,18 @@
 BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jdk16
 .endif
 
+.if ${ARCH} == "i386"
+ARCH_DATA_MODEL=32
+SRCARCH=	i486
+.elif ${ARCH} == "amd64"
+ARCH_DATA_MODEL=64
+SRCARCH=	amd64
+.endif
+
 MAKE_ENV=	LANG=C LC_ALL=C \
 		ARCH=${ARCH} \
-		ARCH_DATA_MODEL=64 \
+		SRCARCH=${SRCARCH} \
+		ARCH_DATA_MODEL=${ARCH_DATA_MODEL} \
 		LIBARCH=${ARCH} \
 		PLATFORM=bsd \
 		OS_NAME=freebsd \
--- openjdk6-b17_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: