Mercurial > hg > release > icedtea6-1.10
changeset 2468:4a9e475fd35d
PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
2011-02-24 Xerxes Ranby <xerxes@zafena.se>
PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
* NEWS: Updated.
* Makefile.am (ICEDTEA_PATCHES):
Add JamVM patches if BUILD_JAMVM are defined.
* patches/jamvm/ignore-more-XX-options.patch: New JamVM patch.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Thu, 24 Feb 2011 22:11:20 +0100 |
| parents | 6ac1377e670b |
| children | b442b847be56 |
| files | ChangeLog Makefile.am NEWS patches/jamvm/ignore-more-XX-options.patch |
| diffstat | 4 files changed, 26 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 24 03:22:54 2011 +0000 +++ b/ChangeLog Thu Feb 24 22:11:20 2011 +0100 @@ -1,3 +1,11 @@ +2011-02-24 Xerxes Ranby <xerxes@zafena.se> + + PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. + * NEWS: Updated. + * Makefile.am (ICEDTEA_PATCHES): + Add JamVM patches if BUILD_JAMVM are defined. + * patches/jamvm/ignore-more-XX-options.patch: New JamVM patch. + 2011-02-24 Andrew John Hughes <ahughes@redhat.com> * patches/pr639-missing_shark_include.patch:
--- a/Makefile.am Thu Feb 24 03:22:54 2011 +0000 +++ b/Makefile.am Thu Feb 24 22:11:20 2011 +0100 @@ -356,6 +356,11 @@ patches/cacao/ignore-tests.patch endif +if BUILD_JAMVM +ICEDTEA_PATCHES += \ + patches/jamvm/ignore-more-XX-options.patch +endif + if ENABLE_PULSE_JAVA ICEDTEA_PATCHES += \ patches/pulse-soundproperties.patch
--- a/NEWS Thu Feb 24 03:22:54 2011 +0000 +++ b/NEWS Thu Feb 24 22:11:20 2011 +0100 @@ -441,6 +441,7 @@ - PR635: zero fails to build on icedtea6 trunk 20110217 with hs20 - PR586: Sources missing from src.zip - PR639: Add missing include line, paths and LLVM flags for Shark. + - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. * Cleanup - Patches are no longer prefixed with 'icedtea-'. - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/ignore-more-XX-options.patch Thu Feb 24 22:11:20 2011 +0100 @@ -0,0 +1,12 @@ +Index: jamvm/jamvm/src/jni.c +=================================================================== +--- jamvm/jamvm.orig/src/jni.c 2011-02-23 09:54:17.000000000 +0100 ++++ jamvm/jamvm/src/jni.c 2011-02-23 09:58:21.000000000 +0100 +@@ -1638,6 +1638,7 @@ + #endif + /* Compatibility options */ + } else if(strncmp(string, "-XX:PermSize=", 13) == 0 || ++ strncmp(string, "-XX:ThreadStackSize=", 20) == 0 || + strncmp(string, "-XX:MaxPermSize=", 16) == 0) { + /* Ignore */ + } else if(!vm_args->ignoreUnrecognized) {