Browse Source

disable jamvm -> segfault

Waldemar Brodkorb 14 years ago
parent
commit
debc4a7d3c

+ 4 - 3
package/openjdk/Makefile

@@ -45,7 +45,7 @@ WRKDIST=		${WRKDIR}
 WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
 WRKSRC=			${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION}
 
 
 PKG_SUBPKGS:=		OPENJDK
 PKG_SUBPKGS:=		OPENJDK
-PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO JAMVM
+PKG_CHOICES_OPENJDK:=	ZERO SHARK CACAO
 PKGCD_ZERO:=		zero-assembly backend
 PKGCD_ZERO:=		zero-assembly backend
 PKGCD_SHARK:=		JIT backend
 PKGCD_SHARK:=		JIT backend
 PKGCD_CACAO:=		Cacao JIT backend
 PKGCD_CACAO:=		Cacao JIT backend
@@ -88,8 +88,9 @@ CONFIGURE_ARGS+=	--disable-docs \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
 			--without-rhino
 			--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) \
 OPENJDK_NATIVE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
 			GCC_HONOUR_COPTS=s \
 			GCC_HONOUR_COPTS=s \

+ 10 - 0
package/openjdk/patches/patch-icedtea6-1_10_Makefile_in

@@ -66,3 +66,13 @@
  	touch stamps/native-ecj.stamp
  	touch stamps/native-ecj.stamp
  
  
  clean-native-ecj:
  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