From debc4a7d3c109490b833434c7e7bca7bf293c832 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 11 Apr 2011 18:37:59 +0200
Subject: disable jamvm -> segfault

---
 package/openjdk/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'package/openjdk/Makefile')

diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index d8a932f70..e9cdfd12f 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -45,7 +45,7 @@ WRKDIST=		${WRKDIR}
 WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
 
 PKG_SUBPKGS:=		OPENJDK
-PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
+PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO
 PKGCD_ZERO:=		zero-assembly backend
 PKGCD_SHARK:=		JIT backend
 PKGCD_CACAO:=		Cacao JIT backend
@@ -88,8 +88,9 @@ CONFIGURE_ARGS+=	--disable-docs \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
 			--without-rhino
 
-MAKE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
-		GCC_HONOUR_COPTS=s
+MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+			GCC_HONOUR_COPTS=s \
+			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
 
 OPENJDK_NATIVE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			GCC_HONOUR_COPTS=s \
-- 
cgit v1.2.3