From dc556eb28261bb511ffece377734be095d02658c Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 21 Dec 2011 18:04:50 +0100 Subject: openjdk6: add icedtea pre 1.11 version from mercurial * add jamvm target * simplify versionhandling of jaxp and other external stuff * switch back to llvm 2.8 for shark, because it is the last version known to work, * llvm works partly * rework postinst and prerm and use zero as default vm * bump INC_PR Signed-off-by: Henning Heinold --- .../icedtea-hotspot-glibc-version.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch (limited to 'recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch') diff --git a/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch new file mode 100644 index 0000000..faa90ea --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch @@ -0,0 +1,23 @@ +Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp +=================================================================== +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200 +@@ -49,7 +49,6 @@ + # include + # include + # include +-# include + # include + # include + # include +@@ -544,9 +543,7 @@ + os::Linux::set_glibc_version(str); + } else { + // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version() +- static char _gnu_libc_version[32]; +- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version), +- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release()); ++ static char _gnu_libc_version[32] = "2.9"; + os::Linux::set_glibc_version(_gnu_libc_version); + } + -- cgit v1.2.3-54-g00ecf