/hg/release/icedtea6-1.11: Disable shark

[omajid at icedtea.classpath.org]

changeset ad4d331b4cd0 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=ad4d331b4cd0
author: Omair Majid <omajid at redhat.com>
date: Wed Jan 11 11:38:55 2012 -0500

	Disable shark

	shark has been very unstable (and/or broken) recently due to various
	changes in hotspot and llvm. It is not supported in this release.


diffstat:

 ChangeLog    |  5 +++++
 NEWS         |  1 +
 acinclude.m4 |  7 ++++++-
 3 files changed, 12 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r ec36b4069f06 -r ad4d331b4cd0 ChangeLog
--- a/ChangeLog	Mon Jan 09 13:34:27 2012 -0500
+++ b/ChangeLog	Wed Jan 11 11:38:55 2012 -0500
@@ -1,3 +1,8 @@
+2012-01-09  Omair Majid  <omajid at redhat.com>
+
+	* acinclude.m4 (IT_SET_SHARK_BUILD): Error out if shark is enabled.
+	* NEWS: Update with note describing shark has been disabled.
+
 2012-01-06  Jiri Vanek  <jvanek at redhat.com>
 
 	fixes rhbz#580478
diff -r ec36b4069f06 -r ad4d331b4cd0 NEWS
--- a/NEWS	Mon Jan 09 13:34:27 2012 -0500
+++ b/NEWS	Wed Jan 11 11:38:55 2012 -0500
@@ -16,6 +16,7 @@
 * ARM assembly language port reinstated and updated; details below.
 * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
 * Drop the outdated NIO2 backport.  Users who want NIO2 should use IcedTea 2.x.
+* Shark has been disabled
 * Bug fixes
   - PR637: make check should exit with an error code if any regression test failed.
   - PR752: ImageFormatException extends Exception not RuntimeException
diff -r ec36b4069f06 -r ad4d331b4cd0 acinclude.m4
--- a/acinclude.m4	Mon Jan 09 13:34:27 2012 -0500
+++ b/acinclude.m4	Wed Jan 11 11:38:55 2012 -0500
@@ -786,6 +786,8 @@
   AC_CONFIG_FILES([ergo.c])
 ])
 
+# shark has been very unstable (and/or broken) recently due to various
+# changes in hotspot and llvm. It is not supported in this release.
 AC_DEFUN([IT_SET_SHARK_BUILD],
 [
   AC_MSG_CHECKING(whether to use the Shark JIT)
@@ -806,7 +808,10 @@
       use_shark=yes
   fi
   AC_MSG_RESULT($use_shark)
-
+# remove the following check to enable shark
+  if test "x${shark_selected}" = "xyes"; then
+      AC_MSG_ERROR([shark is unsupported in this release])
+  fi
   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
 ])