diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-11-22 18:44:06 +0100 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-11-22 18:44:06 +0100 |
| commit | e6e59540e4540dfca17c5904aad6fdc23cf6934e (patch) | |
| tree | c72bc47a8726d3f7ef782402eb1fe2d0beade43b /recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch | |
| parent | 8ef1ab1273b331d0d39bcfc24a1fe80d77a588c7 (diff) | |
| download | meta-java-e6e59540e4540dfca17c5904aad6fdc23cf6934e.tar.gz | |
openjdk7: copy over the openjdk7 from openjdk7-branch
The branches differed to much and I wanted to
keep openjdk-6.
We will loose some history, but
I think that is not a great problem
Thanks to khem for working on the recipes too.
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch')
| -rw-r--r-- | recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch new file mode 100644 index 0000000..faa90ea --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-03b21/icedtea-hotspot-glibc-version.patch | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | Index: 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 | |||
