diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-12-21 18:04:50 +0100 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2011-12-22 23:27:18 +0100 |
| commit | dc556eb28261bb511ffece377734be095d02658c (patch) | |
| tree | a65336fa2ab8f4c4c56bcd25d40d4858d64b741f /recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch | |
| parent | 5fd90b0bdc98e403fdb99c89ff6a51bc69c39c51 (diff) | |
| download | meta-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/cacao-loadavg.patch')
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch new file mode 100644 index 0000000..0fc1a81 --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b24/cacao-loadavg.patch | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | Index: cacao-cff92704c4e0/src/vm/os.hpp | ||
| 2 | =================================================================== | ||
| 3 | --- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.000000000 +0100 | ||
| 4 | +++ cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100 | ||
| 5 | @@ -425,7 +425,21 @@ | ||
| 6 | #if defined(HAVE_GETLOADAVG) | ||
| 7 | return ::getloadavg(loadavg, nelem); | ||
| 8 | #else | ||
| 9 | -# error getloadavg not available | ||
| 10 | + FILE *LOADAVG; | ||
| 11 | + double avg[3] = { 0.0, 0.0, 0.0 }; | ||
| 12 | + int i, res = -1;; | ||
| 13 | + | ||
| 14 | + if ((LOADAVG = fopen("/proc/loadavg", "r"))) { | ||
| 15 | + fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]); | ||
| 16 | + res = 0; | ||
| 17 | + fclose(LOADAVG); | ||
| 18 | + } | ||
| 19 | + | ||
| 20 | + for (i = 0; (i < nelem) && (i < 3); i++) { | ||
| 21 | + loadavg[i] = avg[i]; | ||
| 22 | + } | ||
| 23 | + | ||
| 24 | + return res; | ||
| 25 | #endif | ||
| 26 | } | ||
| 27 | |||
