summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2011-12-21 18:04:50 +0100
committerHenning Heinold <heinold@inf.fu-berlin.de>2011-12-22 23:27:18 +0100
commitdc556eb28261bb511ffece377734be095d02658c (patch)
treea65336fa2ab8f4c4c56bcd25d40d4858d64b741f /recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch
parent5fd90b0bdc98e403fdb99c89ff6a51bc69c39c51 (diff)
downloadmeta-java-dc556eb28261bb511ffece377734be095d02658c.tar.gz
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 <heinold@inf.fu-berlin.de>
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch')
-rw-r--r--recipes-core/openjdk/openjdk-6-6b24/icedtea-hotspot-glibc-version.patch23
1 files changed, 23 insertions, 0 deletions
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 @@
1Index: icedtea6-1.8/build/openjdk/hotspot/src/os/linux/vm/os_linux.cpp
2===================================================================
3--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:22:13.696298239 +0200
4+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2010-06-09 22:24:15.308790737 +0200
5@@ -49,7 +49,6 @@
6 # include <string.h>
7 # include <syscall.h>
8 # include <sys/sysinfo.h>
9-# include <gnu/libc-version.h>
10 # include <sys/ipc.h>
11 # include <sys/shm.h>
12 # include <link.h>
13@@ -544,9 +543,7 @@
14 os::Linux::set_glibc_version(str);
15 } else {
16 // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
17- static char _gnu_libc_version[32];
18- jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
19- "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
20+ static char _gnu_libc_version[32] = "2.9";
21 os::Linux::set_glibc_version(_gnu_libc_version);
22 }
23