Mercurial > hg > release > icedtea6-1.12

changeset 2896:fb1137cef484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
JamVM: Sync with IcedTea7; Updated JamVM to 2012-08-15 revision. 2012-08-20 Xerxes Ranby <xerxes@zafena.se> Robert Lougher <rob@jamvm.org.uk> JamVM: Sync with IcedTea7 * Makefile.am (JAMVM_VERSION): Updated JamVM to 2012-08-15 revision. (JAMVM_SHA256SUM): Updated. (stamps/jamvm.stamp): Use --with-java-runtime-library=openjdk6
author Xerxes Ranby <xerxes@zafena.se>
date Mon, 20 Aug 2012 18:10:54 +0200
parents f44000374b09
children 1479af449489
files ChangeLog Makefile.am
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 15 16:16:33 2012 +0200
+++ b/ChangeLog	Mon Aug 20 18:10:54 2012 +0200
@@ -1,3 +1,12 @@
+2012-08-20  Xerxes Rånby  <xerxes@zafena.se>
+	    Robert Lougher  <rob@jamvm.org.uk>
+
+	JamVM: Sync with IcedTea7
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2012-08-15 revision.
+	(JAMVM_SHA256SUM): Updated.
+	(stamps/jamvm.stamp): Use --with-java-runtime-library=openjdk6
+
 2012-08-17  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* patches/ecj/hotspot.patch:
--- a/Makefile.am	Wed Aug 15 16:16:33 2012 +0200
+++ b/Makefile.am	Mon Aug 20 18:10:54 2012 +0200
@@ -11,8 +11,8 @@
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
-JAMVM_VERSION = 77f2ce1a5d1a1d6795be26b81f1cca6d2a057ce7
-JAMVM_SHA256SUM = ee676b26e7e35b93add471b6b58b7d9e746dbc9933ea1ebe6204f5b9fbfcc7bc
+JAMVM_VERSION = e70f2450890b82c37422616cc85e1a23385f03cd
+JAMVM_SHA256SUM = 3ca7e297ef4daa56c3dd733e21bce795d57ab071243369aa9400c0384ada8a4c
 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
 JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -2031,7 +2031,7 @@
 if BUILD_JAMVM
 	cd jamvm/jamvm && \
 	LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
-	./autogen.sh --with-java-runtime-library=openjdk \
+	./autogen.sh --with-java-runtime-library=openjdk6 \
 	  --prefix=$(abs_top_builddir)/jamvm/install ; \
 	$(MAKE) ; \
 	$(MAKE) install