OPENJDK: Java 7 Update 21 with 'jamvm' as the Java Virtual Machine.

I was unable to compile OpenJDK on ARM using the 'cacao' JVM and therefore
switched to the 'jamvm' which apparently is the default in other ARM distros
as well.  I guess I am late to the party...

1 files changed, 90 insertions, 70 deletions

diff --git a/source.local/l/openjdk/sources/Makefile.in b/source.local/l/openjdk/sources/Makefile.in
index fdfa5d5..db53d48 100644
--- a/source.local/l/openjdk/sources/Makefile.in
+++ b/source.local/l/openjdk/sources/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
@@ -72,122 +72,138 @@ host_triplet = @host@
 @LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER_TRUE@	$(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java
 
 
+#PR56553 - SSLParameters support missing
+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@am__append_5 = \
+@LACKS_JAVAX_NET_SSL_SSLCONTEXT_GETDEFAULTSSLPARAMETERS_TRUE@	$(SHARE)/javax/net/ssl/SSLContext.java
+
+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@am__append_6 = \
+@LACKS_JAVAX_NET_SSL_SSLENGINE_SETSSLPARAMETERS_TRUE@	$(SHARE)/javax/net/ssl/SSLEngine.java
+
+
+#PR57008 - Add missing SslRMIServerSocketFactory constructor from 7
+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@am__append_7 = \
+@LACKS_JAVAX_RMI_SSL_SSLRMISERVERSOCKETFACTORY_7_TRUE@	$(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java
+
+
 # Conditional patches
-@WITH_ALT_HSBUILD_TRUE@am__append_5 = \
+@WITH_ALT_HSBUILD_TRUE@am__append_8 = \
 @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
 @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
 @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \
 @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \
 @WITH_ALT_HSBUILD_TRUE@	patches/hotspot/$(HSBUILD)/revert_arm_debug.patch
 
-@WITH_RHINO_TRUE@am__append_6 = \
+@WITH_RHINO_TRUE@am__append_9 = \
 @WITH_RHINO_TRUE@	patches/rhino.patch
 
-@BUILD_CACAO_TRUE@am__append_7 = \
+@BUILD_CACAO_TRUE@am__append_10 = \
 @BUILD_CACAO_TRUE@	patches/cacao/launcher.patch \
 @BUILD_CACAO_TRUE@	patches/cacao/jsig.patch \
 @BUILD_CACAO_TRUE@	patches/cacao/memory.patch
 
-@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_8 = \
+@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_11 = \
 @BUILD_CACAO_FALSE@@USING_CACAO_TRUE@	patches/cacao/memory.patch
 
-@ENABLE_CACAO_TRUE@am__append_9 = \
+@ENABLE_CACAO_TRUE@am__append_12 = \
 @ENABLE_CACAO_TRUE@	patches/cacao/ignore-tests.patch
 
-@BUILD_JAMVM_TRUE@am__append_10 = \
+@BUILD_JAMVM_TRUE@am__append_13 = \
 @BUILD_JAMVM_TRUE@	patches/jamvm/remove-sun.misc.Perf-debug-code.patch
 
-@ENABLE_PULSE_JAVA_TRUE@am__append_11 = \
+@ENABLE_PULSE_JAVA_TRUE@am__append_14 = \
 @ENABLE_PULSE_JAVA_TRUE@	patches/pulse-soundproperties.patch
 
-@ENABLE_SYSTEMTAP_TRUE@am__append_12 = patches/systemtap.patch
-@ENABLE_NSS_TRUE@am__append_13 = patches/nss-config.patch
-@ENABLE_NSS_FALSE@am__append_14 = patches/nss-not-enabled-config.patch
-@WITH_PAX_TRUE@am__append_15 = patches/test_gamma.patch
-@WITH_PAX_FALSE@am__append_16 = patches/boot/test_gamma.patch
-@CP39408_JAVAH_TRUE@am__append_17 = patches/boot/pr39408.patch
-@CP40188_JAVAH_TRUE@am__append_18 = patches/boot/pr40188.patch \
+@ENABLE_SYSTEMTAP_TRUE@am__append_15 = patches/systemtap.patch
+@ENABLE_NSS_TRUE@am__append_16 = patches/nss-config.patch
+@ENABLE_NSS_FALSE@am__append_17 = patches/nss-not-enabled-config.patch
+@WITH_PAX_TRUE@am__append_18 = \
+@WITH_PAX_TRUE@	patches/test_gamma.patch \
+@WITH_PAX_TRUE@	patches/pax-mark-rmic-java.patch
+
+@WITH_PAX_FALSE@am__append_19 = patches/boot/test_gamma.patch
+@CP39408_JAVAH_TRUE@am__append_20 = patches/boot/pr39408.patch
+@CP40188_JAVAH_TRUE@am__append_21 = patches/boot/pr40188.patch \
 @CP40188_JAVAH_TRUE@	patches/boot/javah.patch
 
-@CP45526_JAVAH_TRUE@am__append_19 = patches/boot/explicit-inner-class-headers.patch
-@CP40616_TRUE@am__append_20 = patches/boot/pr40616.patch
-@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_21 = $(SCANNER_PATCHES)
-@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_22 = $(SCANNER_PATCHES)
-@JAVAC_LACKS_DIAMOND_TRUE@am__append_23 = patches/boot/ecj-diamond.patch
-@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_24 = patches/boot/compile-for-7-cacao-mem.patch
-@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_25 = patches/boot/compile-for-7-cacao-mem.patch
-@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_26 = patches/boot/compile-for-7.patch
-@DTDTYPE_QNAME_TRUE@am__append_27 = patches/boot/jaxws-getdtdtype.patch
-@NO_BYTECODE7_TRUE@am__append_28 = patches/boot/use_target_6_for_bootstrap_classes.patch 
-@ENABLE_CACAO_TRUE@am__append_29 = \
+@CP45526_JAVAH_TRUE@am__append_22 = patches/boot/explicit-inner-class-headers.patch
+@CP40616_TRUE@am__append_23 = patches/boot/pr40616.patch
+@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_24 = $(SCANNER_PATCHES)
+@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_25 = $(SCANNER_PATCHES)
+@JAVAC_LACKS_DIAMOND_TRUE@am__append_26 = patches/boot/ecj-diamond.patch
+@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_27 = patches/boot/compile-for-7-cacao-mem.patch
+@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_28 = patches/boot/compile-for-7-cacao-mem.patch
+@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_29 = patches/boot/compile-for-7.patch
+@DTDTYPE_QNAME_TRUE@am__append_30 = patches/boot/jaxws-getdtdtype.patch
+@NO_BYTECODE7_TRUE@am__append_31 = patches/boot/use_target_6_for_bootstrap_classes.patch 
+@ENABLE_CACAO_TRUE@am__append_32 = \
 @ENABLE_CACAO_TRUE@	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
 
-@ENABLE_JAMVM_TRUE@am__append_30 = \
+@ENABLE_JAMVM_TRUE@am__append_33 = \
 @ENABLE_JAMVM_TRUE@	ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
 
-@DISABLE_OPTIMIZATIONS_TRUE@am__append_31 = \
+@DISABLE_OPTIMIZATIONS_TRUE@am__append_34 = \
 @DISABLE_OPTIMIZATIONS_TRUE@	NO_OPTIMIZATIONS="true" \
 @DISABLE_OPTIMIZATIONS_TRUE@	CC_NO_OPT="-O0 -g"
 
-@ENABLE_DOCS_FALSE@am__append_32 = \
+@ENABLE_DOCS_FALSE@am__append_35 = \
 @ENABLE_DOCS_FALSE@	NO_DOCS="true"
 
-@USE_ALT_JAR_TRUE@am__append_33 = \
+@USE_ALT_JAR_TRUE@am__append_36 = \
 @USE_ALT_JAR_TRUE@	ALT_JAR_CMD="$(ALT_JAR_CMD)"
 
-@HAS_HOTSPOT_REVISION_TRUE@am__append_34 = \
+@HAS_HOTSPOT_REVISION_TRUE@am__append_37 = \
 @HAS_HOTSPOT_REVISION_TRUE@	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
 
-@WITH_RHINO_TRUE@am__append_35 = \
+@WITH_RHINO_TRUE@am__append_38 = \
 @WITH_RHINO_TRUE@	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
 
-@USE_SYSTEM_ZLIB_TRUE@am__append_36 = \
+@USE_SYSTEM_ZLIB_TRUE@am__append_39 = \
 @USE_SYSTEM_ZLIB_TRUE@	USE_SYSTEM_ZLIB="true" \
 @USE_SYSTEM_ZLIB_TRUE@	ZLIB_LIBS="${ZLIB_LIBS}" \
 @USE_SYSTEM_ZLIB_TRUE@	ZLIB_CFLAGS="${ZLIB_CFLAGS}"
 
-@USE_SYSTEM_LCMS_TRUE@am__append_37 = \
+@USE_SYSTEM_LCMS_TRUE@am__append_40 = \
 @USE_SYSTEM_LCMS_TRUE@	USE_SYSTEM_LCMS="true" \
 @USE_SYSTEM_LCMS_TRUE@	LCMS_LIBS="${LCMS2_LIBS}" \
 @USE_SYSTEM_LCMS_TRUE@	LCMS_CFLAGS="${LCMS2_CFLAGS}"
 
-@USE_SYSTEM_JPEG_TRUE@am__append_38 = \
+@USE_SYSTEM_JPEG_TRUE@am__append_41 = \
 @USE_SYSTEM_JPEG_TRUE@	USE_SYSTEM_JPEG="true" \
 @USE_SYSTEM_JPEG_TRUE@	JPEG_LIBS="${JPEG_LIBS}" \
 @USE_SYSTEM_JPEG_TRUE@	JPEG_CFLAGS="${JPEG_CFLAGS}"
 
-@USE_SYSTEM_PNG_TRUE@am__append_39 = \
+@USE_SYSTEM_PNG_TRUE@am__append_42 = \
 @USE_SYSTEM_PNG_TRUE@	USE_SYSTEM_PNG="true" \
 @USE_SYSTEM_PNG_TRUE@	PNG_LIBS="${PNG_LIBS}" \
 @USE_SYSTEM_PNG_TRUE@	PNG_CFLAGS="${PNG_CFLAGS}"
 
-@USE_SYSTEM_GIF_TRUE@am__append_40 = \
+@USE_SYSTEM_GIF_TRUE@am__append_43 = \
 @USE_SYSTEM_GIF_TRUE@	USE_SYSTEM_GIF="true" \
 @USE_SYSTEM_GIF_TRUE@	GIF_LIBS="${GIF_LIBS}" \
 @USE_SYSTEM_GIF_TRUE@	GIF_CFLAGS="${GIF_CFLAGS}"
 
-@USE_SYSTEM_GTK_TRUE@am__append_41 = \
+@USE_SYSTEM_GTK_TRUE@am__append_44 = \
 @USE_SYSTEM_GTK_TRUE@	USE_SYSTEM_GTK="true" \
 @USE_SYSTEM_GTK_TRUE@	GTK_LIBS="${GTK_LIBS}" \
 @USE_SYSTEM_GTK_TRUE@	GTK_CFLAGS="${GTK_CFLAGS}"
 
-@USE_SYSTEM_GIO_TRUE@am__append_42 = \
+@USE_SYSTEM_GIO_TRUE@am__append_45 = \
 @USE_SYSTEM_GIO_TRUE@	USE_SYSTEM_GIO="true" \
 @USE_SYSTEM_GIO_TRUE@	GIO_LIBS="${GIO_LIBS}" \
 @USE_SYSTEM_GIO_TRUE@	GIO_CFLAGS="${GIO_CFLAGS}"
 
-@USE_SYSTEM_FONTCONFIG_TRUE@am__append_43 = \
+@USE_SYSTEM_FONTCONFIG_TRUE@am__append_46 = \
 @USE_SYSTEM_FONTCONFIG_TRUE@	USE_SYSTEM_FONTCONFIG="true" \
 @USE_SYSTEM_FONTCONFIG_TRUE@	FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
 @USE_SYSTEM_FONTCONFIG_TRUE@	FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
 
-@USE_SYSCALL_COMPILATION_TRUE@am__append_44 = \
+@USE_SYSCALL_COMPILATION_TRUE@am__append_47 = \
 @USE_SYSCALL_COMPILATION_TRUE@	COMPILE_AGAINST_SYSCALLS="true"
 
-@ENABLE_JAR_COMPRESSION_TRUE@am__append_45 = \
+@ENABLE_JAR_COMPRESSION_TRUE@am__append_48 = \
 @ENABLE_JAR_COMPRESSION_TRUE@	COMPRESS_JARS="true"
 
-@ADD_SHARK_BUILD_TRUE@am__append_46 = \
+@ADD_SHARK_BUILD_TRUE@am__append_49 = \
 @ADD_SHARK_BUILD_TRUE@	--enable-shark
 
 subdir = .
@@ -477,21 +493,21 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b30
-JDK_UPDATE_VERSION = 09
+OPENJDK_VERSION = b02
+JDK_UPDATE_VERSION = 21
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 9a95d714d136
-JAXP_CHANGESET = f45296ac69be
-JAXWS_CHANGESET = 03f54ef33914
-JDK_CHANGESET = 5ec94d162f05
-LANGTOOLS_CHANGESET = ec73c6927fb7
-OPENJDK_CHANGESET = 301e79a966b4
-CORBA_SHA256SUM = 4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb
-JAXP_SHA256SUM = b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141
-JAXWS_SHA256SUM = 86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a
-JDK_SHA256SUM = 11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6
-LANGTOOLS_SHA256SUM = c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6
-OPENJDK_SHA256SUM = dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b
+CORBA_CHANGESET = 47a6bf94ce11
+JAXP_CHANGESET = d2142901bcb7
+JAXWS_CHANGESET = b1877762d45c
+JDK_CHANGESET = 8e91101e36f0
+LANGTOOLS_CHANGESET = fd956199cb82
+OPENJDK_CHANGESET = 12b96a57263c
+CORBA_SHA256SUM = 7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934
+JAXP_SHA256SUM = 8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6
+JAXWS_SHA256SUM = b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc
+JDK_SHA256SUM = 349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e
+LANGTOOLS_SHA256SUM = 2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12
+OPENJDK_SHA256SUM = 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc
 CACAO_VERSION = a567bcb7f589
 CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
 CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
@@ -561,11 +577,14 @@ SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
 
 # Sources used from OpenJDK.
 ICEDTEA_BOOTSTRAP_CLASSES = $(am__append_1) $(am__append_2) \
-	$(am__append_3) $(am__append_4)
+	$(am__append_3) $(am__append_4) $(am__append_5) \
+	$(am__append_6) $(am__append_7)
+@NO_BYTECODE7_FALSE@IT_LANGUAGE_SOURCE_VERSION = 7
 
 # Settings for javac
-IT_LANGUAGE_SOURCE_VERSION = 6
-IT_CLASS_TARGET_VERSION = 6
+@NO_BYTECODE7_TRUE@IT_LANGUAGE_SOURCE_VERSION = 6
+@NO_BYTECODE7_FALSE@IT_CLASS_TARGET_VERSION = 7
+@NO_BYTECODE7_TRUE@IT_CLASS_TARGET_VERSION = 6
 IT_JAVAC_SETTINGS = -g -encoding utf-8 $(JAVACFLAGS) $(MEMORY_LIMIT) $(PREFER_SOURCE)
 IT_JAVACFLAGS = $(IT_JAVAC_SETTINGS) -source $(IT_LANGUAGE_SOURCE_VERSION) -target $(IT_CLASS_TARGET_VERSION)
 
@@ -631,10 +650,11 @@ OPENJDK_BOOT_TREE = stamps/patch-boot.stamp
 REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
 
 # Patch list
-ICEDTEA_PATCHES = $(am__append_5) $(am__append_6) $(am__append_7) \
+ICEDTEA_PATCHES = patches/hotspot/$(HSBUILD)/revert-7017193.patch \
 	$(am__append_8) $(am__append_9) $(am__append_10) \
 	$(am__append_11) $(am__append_12) $(am__append_13) \
-	$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
+	$(am__append_14) $(am__append_15) $(am__append_16) \
+	$(am__append_17) $(am__append_18) $(DISTRIBUTION_PATCHES)
 
 # Bootstrapping patches
 ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
@@ -661,11 +681,11 @@ ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
 	patches/boot/ecj-multicatch.patch \
 	patches/boot/ecj-trywithresources.patch \
 	patches/boot/ecj-autoboxing.patch patches/boot/xsltproc.patch \
-	$(am__append_16) $(am__append_17) $(am__append_18) \
 	$(am__append_19) $(am__append_20) $(am__append_21) \
 	$(am__append_22) $(am__append_23) $(am__append_24) \
 	$(am__append_25) $(am__append_26) $(am__append_27) \
-	$(am__append_28) $(DISTRIBUTION_BOOT_PATCHES)
+	$(am__append_28) $(am__append_29) $(am__append_30) \
+	$(am__append_31) $(DISTRIBUTION_BOOT_PATCHES)
 
 # Patches for when java.util.Scanner is missing
 # or has the bug #40630 (all these classes rely
@@ -679,7 +699,7 @@ SCANNER_PATCHES = patches/boot/scanner-spp.patch \
 # OpenJDK build environment.
 @ZERO_BUILD_TRUE@ICEDTEA_ZERO_BUILD = true
 @SHARK_BUILD_TRUE@ICEDTEA_SHARK_BUILD = true
-ICEDTEA_NAME = IcedTea7
+ICEDTEA_NAME = IcedTea
 @HAS_ICEDTEA_REVISION_TRUE@ICEDTEA_REV = +${ICEDTEA_REVISION}
 @HAS_PKGVERSION_TRUE@ICEDTEA_PKG = $(EMPTY) (${PKGVERSION})
 @ENABLE_WERROR_FALSE@WERROR_STATUS = false
@@ -714,13 +734,13 @@ ICEDTEA_ENV = ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" ANT="$(ANT)" \
 	USE_SYSTEM_CUPS="true" CUPS_LIBS="${CUPS_LIBS}" \
 	CUPS_CFLAGS="${CUPS_CFLAGS}" STRIP_POLICY=no_strip \
 	JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
-	COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" $(am__append_29) \
-	$(am__append_30) $(am__append_31) $(am__append_32) \
+	COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" $(am__append_32) \
 	$(am__append_33) $(am__append_34) $(am__append_35) \
 	$(am__append_36) $(am__append_37) $(am__append_38) \
 	$(am__append_39) $(am__append_40) $(am__append_41) \
 	$(am__append_42) $(am__append_43) $(am__append_44) \
-	$(am__append_45)
+	$(am__append_45) $(am__append_46) $(am__append_47) \
+	$(am__append_48)
 
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
@@ -916,7 +936,7 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
 
 ADD_ZERO_CONFIGURE_ARGS =  \
 	--with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
-	--disable-bootstrap --enable-zero $(am__append_46) \
+	--disable-bootstrap --enable-zero $(am__append_49) \
 	--disable-docs $(filter-out '--with-jdk-home=% '--with-ecj=% \
 	'--with-java=% '--with-javah=% '--with-javac=% '--with-javac=% \
 	'--with-rmic=% '--with-additional-vms=% '--disable-bootstrap% \
@@ -1744,7 +1764,7 @@ stamps/extract-cacao.stamp: stamps/download-cacao.stamp
 clean-extract-cacao: clean-cacao
 	rm -f stamps/extract-cacao.stamp
 
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
 @BUILD_JAMVM_TRUE@	set -e ; \
 @BUILD_JAMVM_TRUE@	if ! test -d jamvm ; \
 @BUILD_JAMVM_TRUE@	then \