commit: 10e165e075061a73cda563c63616e9cf3d7b63b4 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Fri Nov 13 07:01:49 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Fri Nov 13 07:01:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=10e165e0
dev-java/icedtea: Update to 1.13.9 (http://bitly.com/it11309) Package-Manager: portage-2.2.20.1 dev-java/icedtea/ChangeLog | 7 ++++ dev-java/icedtea/Manifest | 4 +-- .../files/6-cacao-dynmaxheap-Makefile.patch | 10 ------ dev-java/icedtea/files/6-cacao-dynmaxheap.patch | 42 ---------------------- ...-6.1.13.8-r1.ebuild => icedtea-6.1.13.9.ebuild} | 8 ++--- 5 files changed, 11 insertions(+), 60 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index de17131..94da502 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*icedtea-6.1.13.9 (13 Nov 2015) + + 13 Nov 2015; Andrew John Hughes <[email protected]> + +icedtea-6.1.13.9.ebuild, -files/6-cacao-dynmaxheap-Makefile.patch, + -files/6-cacao-dynmaxheap.patch, -icedtea-6.1.13.8-r1.ebuild: + dev-java/icedtea: Update to 1.13.9 (http://bitly.com/it11309) + *icedtea-7.2.6.2 (23 Oct 2015) 23 Oct 2015; Andrew John Hughes <[email protected]> diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index a5415e2..d8c7f70 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -27,6 +27,6 @@ DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4 -DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4 +DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1 DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234 -DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684 +DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17 diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch deleted file mode 100644 index dc87ae8..0000000 --- a/dev-java/icedtea/files/6-cacao-dynmaxheap-Makefile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2015-07-28 07:21:16.447388803 -0700 -+++ Makefile.in 2015-09-06 09:13:16.548000000 -0700 -@@ -182,6 +182,7 @@ - @WITH_RHINO_TRUE@ patches/rhino.patch - - @BUILD_CACAO_TRUE@am__append_22 = \ -+@BUILD_CACAO_TRUE@ patches/cacao/dynmaxheap.patch \ - @BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \ - @BUILD_CACAO_TRUE@ patches/cacao/memory.patch \ - @BUILD_CACAO_TRUE@ patches/cacao/hotspot/original/memory.patch \ diff --git a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch b/dev-java/icedtea/files/6-cacao-dynmaxheap.patch deleted file mode 100644 index 33b9818..0000000 --- a/dev-java/icedtea/files/6-cacao-dynmaxheap.patch +++ /dev/null @@ -1,42 +0,0 @@ -# HG changeset patch -# User James Le Cuirot <[email protected]> -# Date 1441543564 -3600 -# Sun Sep 06 13:46:04 2015 +0100 -# Node ID d0224f4490d6694e77dcb0ff7eae8e2297b822bf -# Parent e215e36be9fc2b7dfe43ff10ec1afe639b289aa5 -Dynamically set the maximum heap size on Linux - -diff -r e215e36be9fc -r d0224f4490d6 src/vm/vm.cpp ---- cacao/cacao/src/vm/vm.cpp Mon Feb 11 19:31:28 2013 +0100 -+++ cacao/cacao/src/vm/vm.cpp Sun Sep 06 13:46:04 2015 +0100 -@@ -33,6 +33,10 @@ - #include <errno.h> - #include <stdlib.h> - -+#if defined(__LINUX__) -+#include <unistd.h> -+#endif -+ - #include "vm/types.h" - - #include "arch.h" -@@ -702,6 +706,19 @@ - opt_heapstartsize = HEAP_STARTSIZE; - opt_stacksize = STACK_SIZE; - -+#if defined(__LINUX__) -+ // Calculate 1/4 of the physical memory. -+ uint64_t qmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE) / 4; -+ -+ if (qmem > INT32_MAX) { -+ // More than 2GB will overflow so cap it. -+ opt_heapmaxsize = 2047 * 1024 * 1024; -+ } else if (qmem > HEAP_MAXSIZE) { -+ // Otherwise use this if greater than default (128MB). -+ opt_heapmaxsize = (s4) qmem; -+ } -+#endif -+ - // First of all, parse the -XX options. - - #if defined(ENABLE_VMLOG) diff --git a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.9.ebuild similarity index 97% rename from dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild rename to dev-java/icedtea/icedtea-6.1.13.9.ebuild index 18438c6..15c6d9a 100644 --- a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.9.ebuild @@ -13,8 +13,8 @@ inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator vi ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) ICEDTEA_BRANCH=$(get_version_component_range 1-3) -OPENJDK_BUILD="36" -OPENJDK_DATE="22_jul_2015" +OPENJDK_BUILD="37" +OPENJDK_DATE="11_nov_2015" OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz" # Download cacao and jamvm regardless for use with EXTRA_ECONF CACAO_TARBALL="68fe50ac34ec.tar.gz" @@ -152,10 +152,6 @@ src_unpack() { } java_prepare() { - # CACAO has a fixed default max heap of 128MB. This sucks. - cp "${FILESDIR}"/${SLOT}-cacao-dynmaxheap.patch patches/cacao/dynmaxheap.patch || die - epatch "${FILESDIR}"/${SLOT}-cacao-dynmaxheap-Makefile.patch - # For bootstrap builds as the sandbox control file might not yet exist. addpredict /proc/self/coredump_filter
