summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/openjdk/Makefile7
-rw-r--r--package/openjdk/patches/patch-icedtea6-1_10_Makefile_in10
2 files changed, 14 insertions, 3 deletions
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 \
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
index 0f49fe67a..193e008aa 100644
--- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
+++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in
@@ -66,3 +66,13 @@
touch stamps/native-ecj.stamp
clean-native-ecj:
+@@ -2167,6 +2167,9 @@
+ stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
+ @BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \
+ @BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk \
++@BUILD_JAMVM_TRUE@ --host=$(host_alias) \
++@BUILD_JAMVM_TRUE@ --build=$(build_alias) \
++@BUILD_JAMVM_TRUE@ --target=$(target_alias) \
+ @BUILD_JAMVM_TRUE@ --prefix=$(abs_top_builddir)/jamvm/install ; \
+ @BUILD_JAMVM_TRUE@ $(MAKE) ; \
+ @BUILD_JAMVM_TRUE@ $(MAKE) install