Lucius-Q-User
/
gentoo-bootstrap
forked from andrius/gentoo-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix icedtea build with GCC 10/11. 

Also fix a problem with hotspot build in icedtea:7.
Previously icedtea:7 was forced to use jamvm but now we default
to hotspot.
This commit is contained in:
Andrius Štikonas 2021-12-07 20:09:01 +00:00
parent c126451d1c
commit 341c9210f7
21 changed files with 298 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -31,6 +31,5 @@ compile JamVM 2.0.0. This serves as our second Java environment.
Finally, we compile git snapshot of GNU Classpath which has a much better support for Java 1.6.
Then we compile a slightly patched ecj-4.2. Together with JamVM 2.0.0 this will serve as
Java environment that can bootstrap Icedtea 2 (Java 7). Unfortunately, I was only able to build
Java 7 with JamVM as VM (which is slower), Hotspot build failed. JamVM with OpenJDK 7 classes
can build Icedtea 3 with Hotspot VM.
Java environment that can bootstrap Icedtea 2 (Java 7). Then we use it to build Icedtea 3
and subsequent OpenJDK versions.

5
dev-java/gnu-classpath/Manifest
View File

@ -1,7 +1,8 @@
AUX classpath-aarch64-support.patch 571 BLAKE2B 5c890b131d77b5923738a3f255dc65355d92ebba4fe337abab2bc5bd6a0a1848cf4bf01ea5c899be62e8fba9711108a27b06cd0369ff3f327dafe753bbfe6791 SHA512 d3aeabaa4e7adcacc15d0122a0bd27621e89e2ec58d1af3ace620f7d923676e9d323c27f387790a66fec68db91174f9b14df4697f04ad270820259f749a1ae51
AUX classpath-miscompilation.patch 2431 BLAKE2B 41a3d5da8a36aa5362606f226ad78e0579f79823c680f1f2a810c2c739252cc38aa2d45327257092e8c26d489757db1d0cc55371a4bc834da10d38e89d7718b9 SHA512 5cb45b3cb4bb18ea4befeec9b29c162dcf8c20ce5207e1b28986d7a7584e7ba32a0cc5489c5c22fa45821375936cf3f7dc9288b8711c26d044bcc53e084f48dd
DIST classpath-0.93.tar.gz 9534222 BLAKE2B 36313f25e165856a8716c18873d725d82f52e20310d2c22ca0b0b0a481e66a00ccad4138c76e96c119772565819bc06cd626bc100ddea0684d04165e10206541 SHA512 69d831361085514bb7c5607fa694914cc01bc9fe589b7744d5534c97d434722193a1b68a336642d0dba9a3b50e9acea0364741790e9f19d196e5956a51c320b0
DIST classpath-0.99.tar.gz 11078232 BLAKE2B cb62cc58b9ce75df98809298a6c6a588704a98a133e8a0378c372e6cc0e6b07c8f05d7bd23c52f2697e6a3b4bfc1f0cdfc7aa108f2f681af154e6fd8c59d9460 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac
EBUILD gnu-classpath-0.93.ebuild 1226 BLAKE2B 36226c0b6641dbc0ac0468f726c740aef3815f3355703efe3b5cc8260d1ba32c8ff8e6dedbea4599bf3462f917ab8e4ba8f9b56ec580efd30f7706cf7b37d253 SHA512 e2f60dadd682177c1b5c1eca310ba417ed49eeb0a5a36dbc5db7217e734e7327e297894c6d0577256f025403e029188bee080d9c45685e8041528ee1bff5a984
EBUILD gnu-classpath-0.93.ebuild 1276 BLAKE2B e2c26f695321c9b7f776186c20c580947bfbf158790fd6ef334c694c1196aca496be0124cb6f79cf9955b4ec7d7381299f8c0845c121d6407e18250ded4f6e44 SHA512 7b4d1800538887ab9392de57821390e3d594eac8d40864520eb3c71479e4a15bc570261826624a182deb7951c30db20309ecf6b1f057e82d84b0025b80e22d21
EBUILD gnu-classpath-0.99-r2.ebuild 2537 BLAKE2B fab0a38c8edac29a281eaf29fbcac159b70ed948d0bfa073e17dc348c4a8218ac9ee58e74a7a47b33421ec8ff0cbb3d622dd69e21c23a33eb074b05221e0d2f3 SHA512 d8529c42327af6964831ade417005762fe6891d58a3d7c34a44d97bcda8e739a4bc30fd09b365bd44907aae71aea83f615bc486a83c7f4c5e39e72533e6c488a
EBUILD gnu-classpath-0.99_p1.ebuild 2487 BLAKE2B 7f93b193096fa337c3a07ef3842568e441a883986f84d5425478a58ed526de81223d61ca63dd7a6de94316026999932e8416b9a170df40d7f7f99bbf50fc369e SHA512 af877559e75445e40fc40d000e786efc3e55a63456cfcc8f529d2d7b81ff61c393965016e7059df67aebd0a60e06f9ec8fdf468c94b140603c6bf264f4e5e8b5
EBUILD gnu-classpath-0.99_p1.ebuild 2488 BLAKE2B 3659e1c2b34f41bf71894129c3c28c93afcc7153aa93031c9e0e68ea69df8419c25cb5e0e6db05e684dd0994fb0fa7c487675f1ad69280dfbd53d29a0c91e340 SHA512 9ff8d1db2319863cf9cd9685c990e0fea588ba68442ad1037c362f4b4232b15ba4a0bdfb2fbade2ca13e66ed9dcada2c1ba437207fe55f61dfd5fece0ea19d38
MISC metadata.xml 252 BLAKE2B a3a36edd6c0b4e630f0e38d236ff4133a5c6b4aa42f5525d8a0978ecdbbe3d53602d3fcde02cf1a495bfabb4fd06f914826df44bda7f542ce8543b32fd7bbfe2 SHA512 1ab83f56876901e45f2b34aa5c81bd1d7b243009236d238b49fca2d49ec167c596ea589de6df1c8dfe1a6b834a2e0e493409ee65d499bd2b6ecaf687ae71df69

71
dev-java/gnu-classpath/files/classpath-miscompilation.patch Normal file
View File

@ -0,0 +1,71 @@
For some reason, the original code gets miscompiled on x86_64, leading
'Java_java_io_VMFile_isFile' to return true when the return value of
'cpio_checkType' is ENOENT (= 2).
See <https://issues.guix.gnu.org/issue/36685>
and <https://issues.guix.gnu.org/49990>.
diff --git a/native/jni/java-io/java_io_VMFile.c b/native/jni/java-io/java_io_VMFile.c
index de1320b..6695e1f 100644
--- a/native/jni/java-io/java_io_VMFile.c
+++ b/native/jni/java-io/java_io_VMFile.c
@@ -240,6 +240,7 @@ Java_java_io_VMFile_exists (JNIEnv * env,
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
+ jboolean exists;
/* Don't use the JCL convert function because it throws an exception
on failure */
@@ -250,9 +251,10 @@ Java_java_io_VMFile_exists (JNIEnv * env,
}
result = cpio_isFileExists (filename);
+ exists = (result == CPNATIVE_OK ? 1 : 0);
(*env)->ReleaseStringUTFChars (env, name, filename);
- return result == CPNATIVE_OK ? 1 : 0;
+ return exists;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
@@ -278,6 +280,7 @@ Java_java_io_VMFile_isFile (JNIEnv * env,
const char *filename;
int result;
jint entryType;
+ jboolean isfile;
/* Don't use the JCL convert function because it throws an exception
on failure */
@@ -288,9 +291,10 @@ Java_java_io_VMFile_isFile (JNIEnv * env,
}
result = cpio_checkType (filename, &entryType);
+ isfile = (result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0);
(*env)->ReleaseStringUTFChars (env, name, filename);
- return result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0;
+ return isfile;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
@@ -315,6 +319,7 @@ Java_java_io_VMFile_isDirectory (JNIEnv * env,
const char *filename;
int result;
jint entryType;
+ jboolean isdirectory;
/* Don't use the JCL convert function because it throws an exception
on failure */
@@ -325,9 +330,10 @@ Java_java_io_VMFile_isDirectory (JNIEnv * env,
}
result = cpio_checkType (filename, &entryType);
+ isdirectory = (result == CPNATIVE_OK && entryType == CPFILE_DIRECTORY ? 1 : 0);
(*env)->ReleaseStringUTFChars (env, name, filename);
- return result == CPNATIVE_OK && entryType == CPFILE_DIRECTORY ? 1 : 0;
+ return isdirectory;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */

3
dev-java/gnu-classpath/gnu-classpath-0.93.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -25,6 +25,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
eapply "${FILESDIR}/classpath-aarch64-support.patch"
eapply "${FILESDIR}/classpath-miscompilation.patch"
eapply_user
}

1
dev-java/gnu-classpath/gnu-classpath-0.99_p1.ebuild
View File

@ -42,6 +42,7 @@ pkg_setup() {
src_prepare() {
eapply_user
eapply "${FILESDIR}/classpath-aarch64-support.patch"
sh autogen.sh
find . -name '*.java' -exec sed -i -e 's/@Override//g' {} \;

8
dev-java/icedtea/Manifest
View File

@ -6,11 +6,15 @@ AUX icedtea-jdk-fix-build.patch 2150 BLAKE2B ebfc48db63836bd3f60f946ad2a647ddfa3
AUX icedtea-jdk-musl.patch 4861 BLAKE2B 40028881fd456a7643501aee235e015039ea7e363c094bb0a23cab2faae1e8ae72501d562f6366f1630c3d1d08f7ee31f05bc95e802be7e146976d9087a07358 SHA512 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5
AUX icedtea-jdk-no-soname.patch 369 BLAKE2B e44f1f539abd742963664a6f64cdd8aaaa7b108b20535ca0a5a20b0892a083e81b676fd1c71a6b021b2fa1f15404520be388f14ac326ac909f0a11f1aac20864 SHA512 bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1
AUX icedtea.env.sh 1130 BLAKE2B 8ffd3a9c558b9abb9df723efc531496537d7883d676c145411d9a4f02ecd6826c5edec9451ced8187224a9c24b408e6cbad3dc11ebcbe2f69a38b0966cb691c7 SHA512 79c279338cc2790df91c92d8d9b97c007f1a030374066dfacbbb2f9aac754eafba9197b748adcb9fe6fbff16bd998b6536298443028df281d1b12d3b348da66f
AUX icedtea7-hotspot-miscompile.patch 857 BLAKE2B 5e2297146aa6be2aa0380169438341f69eb4c6307ca89b2a4378579145f9c413b25ee1af823105d78668506721b2d70c2cd84f06efb4021352d127d528b2dd6e SHA512 072c65e645ce23fa1f5536357ebe5cca155fe515aa487170d034fbcfab6195a5d2ec26cc5e3212530137208db091cb842a316b5af24c5191ae1e22b45a16f17a
AUX icedtea7-hotspot-pointer-comparison.patch 1600 BLAKE2B afc83c45a80a8adf3f8a0cbfef23cacfc1e716adef70bb8d7be3cab6c7ebd765b9becc1a27c5b64d16440090ddaf7777f7b1ae675b9e0fb922cd9adea68fc5a2 SHA512 2325a5bf404c1c7cbe94d2837d18f15d07bcff99434d29b3fdebb189f273d09597e33820d5c0ff2912a9a9921b442bbe8a9c73f528774d0d82e5be039d93cc76
AUX icedtea7-jdk-fcommon.patch 389 BLAKE2B 9e8936c9843b3c5e04b56268a5bc84a6213b0fbb594def7869d9e4ae1820e57b1cc8c4e4a60d3bb3c371bc241a44c409289eb5d6f3dd2edd9bf9ebbd9dcd5f32 SHA512 6fdc7dcdfd5d0c11e180ea5cbff3fad287c0dd5866ecf3aed3e271e343f78d4cfb3fd656c146fec72fd6e5e43d98961f34c53111c9407bf17fbdff18215e7d39
AUX icedtea7-jdk-freetype.patch 461 BLAKE2B 4554b7a497aadba6ac5741a076c964c6830819d61fbea9380ddc4a57dca69173e44802b0e329ea0e2e8b8708df9ac75aac1bf2c3c3bd86102ce8974dc5ce800b SHA512 90a396ee1837a1f5c21fe5165c4f9b134a785c448d5d5f31ad22fd37ff46c8147b6c549a1b0deaab69b70804b583940bfbdb547d4fd076233a18ad8a24156ce9
AUX icedtea8-autoconf-config.patch 3529 BLAKE2B 8f3088c7a089199ab3ea6b67db81e69ccb640c84e3abad8376b35c18152eaa469288963faa0032bbbbb32131f3c02a7a83d76497f4993d201bb3cdb50fd71806 SHA512 662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167
AUX icedtea8-disable-systemtap.patch 569 BLAKE2B 8079c590463bb567f4be47f8db0d83ff4953e61e0d96335e10fba743914fb547585b3b90e5fb385344d5718f289d6ee10d149af36f80a23b18d715ed4a950668 SHA512 b544723b37844462a3939738bd16a0341b85e483207e204db289133e57f6a5ef3f6bde73444735c0ca786a57c6e6478f9d026b572fbe051857edddb3725ae724
AUX icedtea8-gcc-triple.patch 731 BLAKE2B 39f4368f1e22e7f036cf40eeb319898d6377b25f71be274758b9ac1b4847e7a8fdddfaa2b97cdeb43e70f659ae3023f0ae0f9d3a8f571a47d1ca3297d446e37c SHA512 b53e03a4d6ce81d301392e3fd43801641859c5cd43897eb7490e7a4ceedd4ccc568b6e4566620aa293f8e5e943401bf1e576ca3e3902960a058577d23c9b9786
AUX icedtea8-hotspot-noagent-musl.patch 3334 BLAKE2B 6595d4a2a245aea05f39c3ccbd7267249f0d0e8d0564569adf637e75c9ae7a7dfd4aa871d5bd8e924ec706570368e7e0168c4f592236c1e1f2d12e324944b872 SHA512 1545bcd15d47fb77e07cbed955d5757d96b99c659ca833db701f8711f123ccef6538a2c1fedd87d3c75f1e309ed840c4c74611f6840369c12ef30633adbdb523
AUX icedtea8-hotspot-pointer-comparison.patch 1229 BLAKE2B 34106aa6c49181e28c5d4b56ca1c1779d60bef97084d4be8e136bcd7461ca484ac585b41c3e7898275ccc615edd713f890c7014e7d95ebae6fcf0df6cda3845f SHA512 f017bdaaf3e081a59e4c238c9d5852a9e5f12d37566e2a755706f75b245977d6f81ddca3f7326145c8b335d35b7bebda1e55ed0428a6b86eeeceba5a88fd7eca
AUX icedtea8-hotspot-stop-using-obsolete-isnanf.patch 1871 BLAKE2B b26f273922ee9602d10938e4023724bb5df544a4bb3a67af31af6241db10e827f33a2000d54bc2672c8af9763735ef16c8f48c40947067c719ff859786d656c6 SHA512 8bfe6ff11e25ca32862ba48ae969b31327d3da24702ef6eb06093e0f41348c677f91e5f98cac2ce6bef32415a15d5b1df47a92e787cd602cc581bb69e2eccc60
AUX icedtea8-jdk-execinfo.patch 692 BLAKE2B ca92273d0ce717176765186c9c3039d2644f3a0935d0dc5df354caf31e031fbb13a85ec8aa2b90c6f03b2e98f021d64dfc463b1e969d76c2eb90bbc4c8f30100 SHA512 75804b229d9230f5410fcd731a99448ea5d50e1fa2ce2a39cbb21c9a9f00edef6e76561fc8c19e989b738c3e97c8e7d968a70343fc1bda6736a22d04e7db105e
AUX icedtea8-jdk-fix-libjvm-load.patch 483 BLAKE2B 9d107245fe7a88a73b1ae949f54cac38bed0a763534213f940f8578dcb49b0a19001694c3aea7430cd76340eb11a45bcf3498911ec6bfe5ad5a7a29f191633ad SHA512 b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec82792f3c9393150a9bd628625ddf7f3e55720ff163fbbb471
@ -40,5 +44,5 @@ DIST icedtea-3.7.0.tar.xz 1487360 BLAKE2B efef75c5ac615c21310f16f50fc425c5a76076
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01ec389f3682cf3164d06f5404d1d16359c87b37d6ae4101f7c33cde30bad4f3d52af18f0f410e36868b2c9d1280661d2340e683b SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
EBUILD icedtea-3.7.0.ebuild 14185 BLAKE2B d0a19cfc9243bc5bb10a22947b47a4674d2900565fb5372d5956257a356c5076255396dd05f06ec944175ff2c8242490c6264bae702cbe432aa1a928fdd0178c SHA512 19d3d776e0188fd8dc9da00458d0fdc72ab687d0f3d073009af1fbaaabdb7811f691b1dbf4be7d934dc9ab282a12b40a06e06761a725229a097751e47603fc66
EBUILD icedtea-7.2.6.9.ebuild 12367 BLAKE2B 16b39d076a9062571b271f139d85f1e65c16ada06def47e6bd58d7d007d0873abb25962443e1b4afb975eb31f55a0f02e25acc42969a486a5b68a9cf2300630c SHA512 eacc861a9d6408af6bdb5e80b7d0d1c20b4d3d5f60c3b94e685f52421ce0154c1a68b4a07dddb27250913d822bf734c3b377ab1545de98786a55206716b8209d
EBUILD icedtea-3.7.0.ebuild 14544 BLAKE2B 644ac218fab4963db958f442d3c294818bc5aa579b0547c5a88b8cfb0553823065ae4c57f5da34422c8ad8516b2bfd25b6d86f543ac82b825590038f0544c5c8 SHA512 8c014f7bd04643abfadf1b8f4ec259acd5898111eb38f42d48f92c19b7355d4b7ac1468d2e9cace04a3060a3ab0228e921ee689dab023c131cda55b84073e655
EBUILD icedtea-7.2.6.9.ebuild 12931 BLAKE2B 274ddf6ac7df798cf3d96aa762dbb82b2ce36572d9e2814725e5f06ce31d10a66933d9380394222e8cf6f08ee13906c464aed81c5231970e0d1e2d8e0d4cc392 SHA512 e2449625973b9980f1d5241e0f2d02539d6b90c3bc225142cf67b511298bb472f69b5880601a2c5bfe118579ae6ccc1af642f7dc80fa596ad096cba960dc1ab6

25
dev-java/icedtea/files/icedtea7-hotspot-miscompile.patch Normal file
View File

@ -0,0 +1,25 @@
--- openjdk.orig/hotspot/src/share/vm/memory/dump.cpp 2021-12-06 19:02:27.037014756 +0000
+++ openjdk/hotspot/src/share/vm/memory/dump.cpp 2021-12-06 19:03:01.597850811 +0000
@@ -1426,7 +1426,11 @@
/* Skip spaces and control characters */
continue;
}
- h = 31 * h + c;
+ jlong h0 = h;
+ for(int i = 0; i < 5; i++) {
+ h += h;
+ }
+ h += c - h0;
}
return h;
}
--- openjdk/hotspot/src/share/vm/memory/dump.cpp.orig 2021-12-07 00:12:44.969219667 +0000
+++ openjdk/hotspot/src/share/vm/memory/dump.cpp 2021-12-07 00:12:54.219429310 +0000
@@ -1554,7 +1554,6 @@
if (computed_jsum != file_jsum) {
tty->cr();
tty->print_cr("Preload failed: checksum of class list was incorrect.");
- exit(1);
}
tty->print_cr("done. ");

31
dev-java/icedtea/files/icedtea7-hotspot-pointer-comparison.patch Normal file
View File

@ -0,0 +1,31 @@
--- openjdk.orig/hotspot/src/share/vm/opto/lcm.cpp 2021-12-06 12:25:52.743843656 +0000
+++ openjdk/hotspot/src/share/vm/opto/lcm.cpp 2021-12-06 12:26:05.814241520 +0000
@@ -60,7 +60,7 @@
// Check whether val is not-null-decoded compressed oop,
// i.e. will grab into the base of the heap if it represents NULL.
static bool accesses_heap_base_zone(Node *val) {
- if (UseCompressedOops && Universe::narrow_oop_base() > 0) {
+ if (UseCompressedOops && (Universe::narrow_oop_base() != 0)) {
if (val && val->is_Mach()) {
if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that
--- openjdk.orig/hotspot/src/share/vm/runtime/virtualspace.cpp 2021-12-06 13:08:11.976366383 +0000
+++ openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp 2021-12-06 13:08:34.377048681 +0000
@@ -527,7 +527,7 @@
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
Universe::narrow_oop_use_implicit_null_checks()) ?
lcm(os::vm_page_size(), alignment) : 0) {
- if (base() > 0) {
+ if (base() != 0) {
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
}
@@ -546,7 +546,7 @@
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
Universe::narrow_oop_use_implicit_null_checks()) ?
lcm(os::vm_page_size(), prefix_align) : 0) {
- if (base() > 0) {
+ if (base() != 0) {
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
}

11
dev-java/icedtea/files/icedtea7-jdk-fcommon.patch Normal file
View File

@ -0,0 +1,11 @@
--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2021-12-06 17:35:01.291049716 +0000
+++ openjdk/jdk/make/common/Defs-linux.gmk 2021-12-06 17:35:28.811707263 +0000
@@ -271,7 +271,7 @@
#
# Misc compiler options
#
-CFLAGS_COMMON = -fno-strict-aliasing
+CFLAGS_COMMON = -fno-strict-aliasing -fcommon
PIC_CODE_LARGE = -fPIC
PIC_CODE_SMALL = -fpic
GLOBAL_KPIC = $(PIC_CODE_LARGE)

22
dev-java/icedtea/files/icedtea8-hotspot-pointer-comparison.patch Normal file
View File

@ -0,0 +1,22 @@
--- openjdk/hotspot/src/share/vm/opto/lcm.cpp 2021-12-07 10:44:23.420257873 +0000
+++ openjdk/hotspot/src/share/vm/opto/lcm.cpp 2021-12-07 10:44:58.391090898 +0000
@@ -51,7 +51,7 @@
// Check whether val is not-null-decoded compressed oop,
// i.e. will grab into the base of the heap if it represents NULL.
static bool accesses_heap_base_zone(Node *val) {
- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
+ if (Universe::narrow_oop_base() != 0) { // Implies UseCompressedOops.
if (val && val->is_Mach()) {
if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that
--- openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp 2021-12-07 10:58:44.270763801 +0000
+++ openjdk/hotspot/src/share/vm/runtime/virtualspace.cpp 2021-12-07 10:59:27.891802877 +0000
@@ -342,7 +342,7 @@
(UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
Universe::narrow_oop_use_implicit_null_checks()) ?
lcm(os::vm_page_size(), alignment) : 0) {
- if (base() > 0) {
+ if (base() != 0) {
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
}

10
dev-java/icedtea/icedtea-3.7.0.ebuild
View File

@ -6,7 +6,7 @@
EAPI="6"
SLOT="8"
inherit autotools check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
inherit autotools check-reqs flag-o-matic gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
ICEDTEA_VER=$(get_version_component_range 1-3)
ICEDTEA_BRANCH=$(get_version_component_range 1-2)
@ -191,6 +191,7 @@ src_prepare() {
ln -s "${FILESDIR}/${PN}${SLOT}-gcc-triple.patch" patches || die
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-stop-using-obsolete-isnanf.patch" patches || die
ln -s "${FILESDIR}/${PN}${SLOT}-os_linux-remove-glibc-dependencies.patch" patches || die
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-pointer-comparison.patch" "${S}/patches" || die
eapply "${FILESDIR}/${PN}8-disable-systemtap.patch"
eapply_user
@ -198,6 +199,12 @@ src_prepare() {
}
src_configure() {
# GCC10/-fno-common handling, #723102
if [[ $(gcc-major-version) -ge 10 ]]; then
append-flags -fcommon
append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse
fi
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter
@ -218,6 +225,7 @@ src_configure() {
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-gcc-triple.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-stop-using-obsolete-isnanf.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-os_linux-remove-glibc-dependencies.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-pointer-comparison.patch "
export DISTRIBUTION_PATCHES

25
dev-java/icedtea/icedtea-7.2.6.9.ebuild
View File

@ -56,7 +56,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
KEYWORDS="amd64 arm64"
IUSE="+alsa cacao +cups debug doc examples +gtk headless-awt
+jbootstrap kerberos libressl nss pax_kernel
jamvm +jbootstrap kerberos libressl nss pax_kernel
sctp selinux smartcard source test zero"
REQUIRED_USE="gtk? ( !headless-awt )"
@ -87,7 +87,7 @@ COMMON_DEP="
>=dev-libs/glib-2.26:2
>=dev-util/systemtap-1
media-libs/fontconfig
>=media-libs/freetype-2.5.3:2=
>=media-libs/freetype-2.10.1:2=
>=media-libs/lcms-2.5
>=sys-libs/zlib-1.2.3:=
virtual/jpeg:0=
@ -175,6 +175,9 @@ src_unpack() {
ln -s "${FILESDIR}/${PN}-jdk-fix-build.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}-jdk-execinfo.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-jdk-freetype.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-pointer-comparison.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-jdk-fcommon.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-miscompile.patch" "${S}/patches" || die
}
src_prepare() {
@ -197,13 +200,19 @@ src_configure() {
# Export patches for configure
DISTRIBUTION_PATCHES=""
DISTRIBUTION_PATCHES+="patches/jamvm/jamvm-1.6.0-aarch64-support.patch "
DISTRIBUTION_PATCHES+="patches/jamvm/jamvm-1.6.0-opcode-guard.patch "
if use jamvm; then
DISTRIBUTION_PATCHES+="patches/jamvm/jamvm-1.6.0-aarch64-support.patch "
DISTRIBUTION_PATCHES+="patches/jamvm/jamvm-1.6.0-opcode-guard.patch "
fi
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-musl.patch "
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-no-soname.patch "
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-fix-build.patch "
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-execinfo.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-freetype.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-pointer-comparison.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-fcommon.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-miscompile.patch "
export DISTRIBUTION_PATCHES
@ -220,8 +229,10 @@ src_configure() {
use_zero="yes"
fi
# Use JamVM for bootstrap
use_jamvm="yes"
# Use JamVM if requested
if use jamvm; then
use_jamvm="yes"
fi
# Use CACAO if requested
if use cacao; then
@ -311,6 +322,8 @@ src_compile() {
# With ant >=1.8.2 all required tasks are part of ant-core
export ANT_TASKS="none"
export DISABLE_HOTSPOT_OS_VERSION_CHECK=ok
emake
}

34
dev-java/openjdk/Manifest
View File

@ -1,4 +1,4 @@
AUX bootcycle_jobs.patch 1274 BLAKE2B 4d44d1ab97fae90c00ac13e00e5a4caf71ec8961d7645957b1732ea8a55822b870131e154065bcebd44b27f7cbc11f07b2a030723486a8159845481b635916dc SHA512 abcf97b658661c05fe7ddbb26707061ddefb30a8133d295fd10b34540d32401b6812d07083feb73a7521be13faeaddf0c3bf3e40cc2e7c3f15f70ed3e43667b9
AUX bootcycle_jobs.patch 1273 BLAKE2B 4ff4b9f629167230aa0800da4559b1d31028924971850e9067edb35c506ae4e3eeb0fe8a2d593550c49ff0136641b3c9aebad21bb622eafd41244154474ce5b0 SHA512 6f033c2ab8ef5acb516fcd46dd94ba1021b9f3f3f844595341d2984e67dcbfe442af6918041d1d00922d647e2c31e75820835f9f1eeb163abb0f3ab804e4b864
AUX musl/10/aarch64.patch 278 BLAKE2B efe0e23db53c8bfc6bb7c54268428729cfbe2968615ff1ea1d918f357ab3d6000dab0dfd9670a66005f158525ea5a679cb7ad26fd5cf096fae0b23538d79232a SHA512 479d0183aece1ca3f41d4eb9e9bf69d3d0fc2668e32d8b826ae3bd117da5d83241868e8b0cab6773cb87bd7403f17d519cc190c530a783b51f28a6aee0272bea
AUX musl/10/build.patch 19515 BLAKE2B 5fa8b50bf86771f1b20023cb850081e05e73942552cd17520829593fcbe376e43257182ca339f24c7375b21ecb17490ee28155d9d63e806825802198704c0034 SHA512 792dd959f98bd81250b568ea1972374431963cec16d8a9955e1aece71a0a4a06446cd7cf879273760eddee65561d0cf6c54cb25824bec389657e7fe05335896b
AUX musl/10/fix-bootjdk-check.patch 25760 BLAKE2B 91bf753a207cc4dd9aae821be000f4eacd87ee8048db3e2f5968903ffb408dc618fb6d3ce056df60348a8e7391a91caca2b14364bfe5087e1dcac1485bc60f24 SHA512 b683d61a5d586c2557834816410b58f27067ce8fe71d68df6d492bf4f730a21bf913cade4bbaf368be16fc6b3b76d8309012a4735fe0431b2abc95c4d8f059da
@ -47,7 +47,6 @@ AUX musl/8/0010_fix_jdk_close_fds.patch 3026 BLAKE2B d417e2d18bbdeed1ba21842cf7b
AUX musl/9/aarch64.patch 285 BLAKE2B fbd5fc18e648d28f61605c5c31fc714dafb6cc3899b19beaba66a2a11e6aee97426844f0b0912f28f1cbc7d19272b3632975ad6d529395f0335a46bb64c19005 SHA512 4019e5c8a4a6e171d79a2c92a11d671dabd46690cfcb07161cb23e351e158207ff9a0d2d111b68816383a74301510de7caed6e51772231746d499f895ad8ed3f
AUX musl/9/build.patch 19356 BLAKE2B d92f6fcd921b5440c355cf2e941e133139af5aafbabd664bd91f02d01b610e0a0584f4c4f230c0f447e21a08427b07d28e8f748139f18bd2c32a255fb94950b4 SHA512 605ba644b96ef0d9eaa1531cfa47330a718f8fe72d1676709f49016b8b245319e5700cec9ef03f7c32a77ec133cc98ab806a3fc264c21cfe59f0881554ecf9d5
AUX musl/9/fix-bootjdk-check.patch 801 BLAKE2B 50ea3218bcceacd35cf6fefe0c4e6adda476e83ec3247ac136f053688149aa1c5420620bd8f5b6c90fbc9c0aed18c37a79b3ce0df957fa0e510be6ac4b31cfb2 SHA512 a132df211c86aed5af8564cb584b4ee69ce07f3186f5f6ca4b5c1af4355c47f060534d0fd65e9415b0082de2c4912de63a776fff63241b8f3b20951fb45f9f73
AUX musl/9/make-4.3.patch 740 BLAKE2B c155e808f69221c6720841c6ce9bb2fb58b413ad2864fd5b5b3e661e57796d75ac5740d2873d9222174045015c8ad96e6b3b966b3361a3a7cd164ad0968552e0 SHA512 8460dde4d40d57254f14e995090bc4255ee7662d18c19f127d56a1d12d53ec56731574a784ed5d68e89aef1133da760f30ae0982389cf1512ccab1d5f62c4b75
AUX musl/9/ppc64le.patch 5969 BLAKE2B 42836db6e27bbb6781e319fdccfe99ebb2a0e68b17be6737ffc2bbb84e5c25c14d5527d150a00367279e31e05cd482b7a29f5440696b0d47f508d0b79cb16c64 SHA512 61bbb9a0d91faef9dc085726dad8242312cf3e819ed69ca8dce873ff152d02366fab78a7d6d587b9ca5bc233660056076827ec4b6b521af552e40d3e938c9d4d
AUX openjdk-10.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
@ -62,11 +61,14 @@ AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd
AUX openjdk-9.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
AUX patches/16/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
AUX patches/17/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
DIST jdk-10.0.2+13.tar.bz2 1865415 BLAKE2B 46d2f743e2eab0ab1db0714123d4315b417c1970b2cca57ff83acd58ac6dcfca03350136d3aa20c2c8f45c7a50906a648dc581f1bd1dd7723b32bbee3c3c6ea8 SHA512 fd84be24a1b0e0d05ee41518d48443f17baa7a5e0ef7404bb1f9e9e88e6ae90bcd7e36c3d4facada72c952b9a68c5cef14f63e60b6de14ba47e70f9e6bdcc7db
AUX patches/9/hello-class-list.patch 929 BLAKE2B 87fa4b4eb73ad9e091f4c32b0c97fc67f63d321cad0d99b715a504295f89c8f24cf146bef17ac0b334897555463efc232d4a785724d13461e02fa9fb33b351dd SHA512 66279d4d53e7e8eeeb7fe5dc97d170ed2dfca566631f18b12ebfe528f815e8f5c188190f3dadce3c3ee7f20cc4067a3a1127287cd72f8316f2573f24f63f7028
AUX patches/9/make-4.3.patch 740 BLAKE2B c155e808f69221c6720841c6ce9bb2fb58b413ad2864fd5b5b3e661e57796d75ac5740d2873d9222174045015c8ad96e6b3b966b3361a3a7cd164ad0968552e0 SHA512 8460dde4d40d57254f14e995090bc4255ee7662d18c19f127d56a1d12d53ec56731574a784ed5d68e89aef1133da760f30ae0982389cf1512ccab1d5f62c4b75
AUX patches/9/pointer-comparison.patch 1162 BLAKE2B 048b67bfe50d658bb0e4756b66a307fb680d0e1c6f18458eff3a666334f5d94425138ba343907247b284402f47d78a6fc85df5aa6381ad78b3d7a7e116d822c7 SHA512 8d92d8be4a3a0227d602b99e581f05a16f54ad633111abf3355bd933db344c726e22e285b33f936d6e70c7da9087bc113477aba78554f37b273a70e784aaca5a
DIST jdk-10.0.2+13.tar.bz2 88365048 BLAKE2B f898a0976cff12cca439ccdba2bf7eff7fcbc5f00709fa41302fd781819a44165fa864d5e551023c507ad18dc957abd24b15744fc6dc5304ee1a26bd4cb8cb86 SHA512 7491da11d5e0013db75d33e09be7a91ac0dbcde6282541a39fe471fd5368d49b15403bc7508b330ca60210b3ca02730743ba280657283a231853f6882a3ca74d
DIST openjdk-11.0.9_p11.tar.bz2 91638327 BLAKE2B a04b7fb5ebde3b6c024e5f3931a2efe796e08ad66c0190cddfa4268d5181f46f24685d9d51ae328547916e8ece723967bf653feeac87347ee14ecbe213ad657a SHA512 a0a6726d5adbe95904b78d8b4319bc4386c594a563f80f63d59072cf72d00928b451163b91258b44193a80851400ce8b8d142fecfd2bd902ff7a5e47cb4a9976
DIST openjdk-12.0.2_p01.tar.bz2 1658584 BLAKE2B fe241cd84044d4722c097ecc0e721b97c601754c6b56d893873bba21020c12e5cae848228b76eeaf2ffe15cb0eeeddb84970a5927181d1062a6c23ba1ff51f23 SHA512 c3ef3c3326ff31380142502771c078303f229b79f4fa9748a401a35a7e5843d07e937eba23ec8d87fe4d20545f4a3011731c7612a77be2cef66a1a03043cb2bd
DIST openjdk-13.0.4_p01.tar.gz 1664699 BLAKE2B c34d51e4153ee63ac145a5d7ceb1534c119a6bf5dcbc1012ec16b182639333a8ba17480e5a09b76179884c1da9c21ef873d86c63d4e6813ca56a2d8225e3af0e SHA512 0941e3d363483edf497e37b23c90ecf31cecfb2881d6596ceb7212a660b556aa65c0dfd73f0bd2c6c38d8bd17f2c945067e662e7e0fea19bfc13575390f69bf3
DIST openjdk-14.0.2_p01.tar.bz2 1730264 BLAKE2B 7553d6df43936de7fafb402d3b6d276f5331da8c5883dac52f118b34d820e3260626b73f0edc19358eda6451d33f64f8c9ae1a57873460e0db5e1d4c8523100f SHA512 b01be476ba51e64a5034ed2471e431f288a95ccd45acafca0b3bb96075955ad6cfc32e01c1004e51dc8afd8910ed6b895b758972bc24db30591d55070e13491c
DIST openjdk-12.0.2_p01.tar.bz2 83912905 BLAKE2B cf81872dc9a68758bd46a0c486893321461323872d204028b84c36fdd8f9de54c88bb70d4f0c50b7370f589a424852e74a383dea71e17c227ac740283dd933e4 SHA512 53c66ae9bdc6aa47b05f57845d696edf55c5e5eeb6c7dd6cd46b9a0cfad9864db846ac88e00aefbc86ff9ffa77ab9bcf9cf3c73b7f3b797ad68d9e8609438dd9
DIST openjdk-13.0.4_p01.tar.gz 107539608 BLAKE2B b6887819aa2cb7c90be019fa0a7b11c6e65f2f307e36062ef95f38ec85b279ad55bdfd398343405b834ce59e56249bf2653856265752c3e00fdb94fa230c02a9 SHA512 c5c1a961be02f9cd5eac8b7ce0d28024e6b7aa55ec45fb9bb2b62d8b4c2eec874098e74dbb4d19fb8525b097900f91eb900e5309bebeb4297f168f92321a0918
DIST openjdk-14.0.2_p01.tar.bz2 83827689 BLAKE2B acd8a61156800941781a2f4c2d3acc61d7124254ec573b6e4eb45e0e031b4b4403475bec617c4130715b5764982a0d2bf990c07e8593817524093ed7fc86a2c8 SHA512 fb129d2e0f3b007d249073c6a0f20fe9c2917eafbae1c4a6c51126180a70e5debb348c3770a785b54576f2a338cb10fdfbd1fca5879e49f80a4fa5c190338fa9
DIST openjdk-15.0.0_p36.tar.gz 101812870 BLAKE2B 1028ab04825941452b603998f05e2a7e419931979a19855f6ea6c1578c331704ac19ae77043a4f44b2f5d9d481b9a9eaad6c3e3eec9154789d54980ba0295bb7 SHA512 c08d2818de06569278b67954556221ed7c6ab6848ffc57823b789f370ebdd332d2803979a5a254e8f9f669ea161bb479f66ad4e1490b37889d38233b6cca4357
DIST openjdk-16.0.0_p36.tar.gz 104327489 BLAKE2B 7d20f72000155829cf5c36c430bde5ce7d22000b363583da25de9bc7b070b601141ad49b11f3505a344baea36ea846936e148e80c1fadf6e4ace53582f92480c SHA512 082d8a7fdc3f096fdc843869af7d43aa1eb9ac6b0538fbb5f8a0f4d942051a90e49932b30f3d2c3620845fb98373097e509a8432d16f1d44742f44286dccb46d
DIST openjdk-17.0.0_p35.tar.gz 104595247 BLAKE2B e5cefa2d5f00757ca2ff88fe8ebfa268d8bfd74c9046349b6298c5a73bd98212ff7c38157d23b1c83dd2ef86fdc8a297425a2fe66b3f88f6081c6464e4085465 SHA512 0323909edbddc8e889a0daa226e184a6f8474ecd6917f97eadf0752475b99f15cbdca75220f96fd1d4b98b31660d7b5bb518c8a91efed15bdfba4faacd4e74ca
@ -83,25 +85,25 @@ DIST openjdk-aarch64-shenandoah-nashorn-jdk8.272_p10.tar.bz2 2838876 BLAKE2B 40d
DIST openjdk-corba-8.272_p10.tar.bz2 1033649 BLAKE2B db9d72dabe4b1727dbbe1de01e46f62676c48668e7ec960e10643c19374a2553dee3c2b5b576f85d09b541b570756b20980e1307fc614e4b4bee9789affc650e SHA512 1426b3ce6983429fe6399da77fb102fb5d54ebf65ab83ad4e3c0ee789e33e2a0afc1bbfb7b8f942334ff9b03be0696494919c374ce1b793b179ecc43e2c4384a
DIST openjdk-corba-9.0.4_p12.tar.bz2 1002503 BLAKE2B 789664686432cee36e7e165aa4ac6e9a2ed1a1a85a961cd362d9bbdf59d7c7077b71bd2fc59e03f3e3a8cdbc4443a7e359fbfbbbaebfe29bbd220e3cafc3a298 SHA512 455998437a9e3ff538b921025d57e19e6fb5148b3f124c9c427c3604689884d81b3ce5c9dbd93d88de26bf1b43ce76d75f75afd95e473a94973a668575e41748
DIST openjdk-hotspot-8.272_p10.tar.bz2 8206390 BLAKE2B 6822635a29f919696c7a260bf7db20a749ec8598e6c751a8a5e3973c780c17f3ff16a1ed64eb44353be72136fd1ea945dc6620f18d0d876a5773c897bca8705f SHA512 48444d86bacaef503303fb160dca538546e74f7bd71fd34fc2b9faa4e0b1cf7710a6262e9ead161c1b0e8e02e8f96e56a6407d442bbfb01ff8ab835cd840d834
DIST openjdk-hotspot-9.0.4_p12.tar.bz2 1685660 BLAKE2B 580efa34ecb4235630c609dae788115b343ead060d36d3b7939601a6e673dbefb428ef6e7043b3345b944cf080b7b7c6b34f9b094c4e0aa2455be80d8f5ea110 SHA512 2ddde2504951ee09e625987e6773a9c1e0b8c2b8c367e5a7ebf72dc94f2979172ea6ea7482eee16df2c9500a6b32cd90950d0f370242e97562e47b49610a8a92
DIST openjdk-hotspot-9.0.4_p12.tar.bz2 11411231 BLAKE2B a21a5003266f6d8f60adaf78b109d496e46058841d0ab2c8f17256a503124b36e18908240f04fdbb16c056a1f68608f891fed1dbb9c9a0b2bb2326a303a32a4f SHA512 49d93764b13085a5626bec1c3d4e790f8748c24577a4e990e76bd1006721a5b8b9a256c40bf6419df4dda6f6390e457485f90c1b1101c010476a04d9056e9f16
DIST openjdk-jaxp-8.272_p10.tar.bz2 2692905 BLAKE2B e8fa9e6a7fd4c4ebeba82a3c55b17e4eba9cb03660baa8d478a8cfced1ab9673465faa1a0f690ebbe2634b2cf2741d7321f2c20c748339237eba7b772a2cea14 SHA512 15efb3db0dc28fd375d769037f248b3527e40d2c190fed57ca1d6a09e59aa79465c0e6516d2a122f6c7ee55f7cfeadaa76669884f74fa34b11ccfdfd76e71f6d
DIST openjdk-jaxp-9.0.4_p12.tar.bz2 1750744 BLAKE2B 387225c5a464f5a59ba698a2151aa28cea98c12e17ae49b7a86d5a4bcd80e293ffa9ec1d6485ca1934bee4011b636de1b2cf863ed1eaf6e28a5022a15c5b9124 SHA512 af5255637395c826d5fdc5cc510d1cda39b1b67a3647b7cb99f1c380e71c777a985e1ef196530bf2792d49c54d1a382af5ca1d508fbd6ea4f897fd338748cfa5
DIST openjdk-jaxp-9.0.4_p12.tar.bz2 3215994 BLAKE2B 57061280601277706ef263e19a8a8ff7eadeaa8d60edc9fe195d15669b554684f5b4132d4899d9031888f3140a6acbab8b0d7ba950d304d7e83b1e3f74253259 SHA512 82f28586fd576cc01062e2ff37a917987775838910e4a5ecdfd096abec1c8d23028b77bfc87a38ada53bc30d71d89bde7408c1ae572a43c87a71ced64fd08d3a
DIST openjdk-jaxws-8.272_p10.tar.bz2 2543199 BLAKE2B 3deae4cef17a5f3d513c1a748a72b50bacb3a0d9b6fb33e5ded121f4d209cc2eb2d59d7b7c182015811426e49eb3e2b463279fa201992c51a5c4a94a184931c9 SHA512 51c0ee76a7e0587ac9c2533d62717f24224ec8bc643df6af2e2fac89cd79cc4f228c7c57427e43f354a594568d16bb5bbf3295af9ce52717339c35b56d6c375a
DIST openjdk-jaxws-9.0.4_p12.tar.bz2 1884346 BLAKE2B e3682e046cabefeea3b747635452ff687bca97c3883454b6bafba434fbf4ddbd1e4ea6cc7255d30968198a645039f38f8c42a25604fa17b9b67e1bea63195bfb SHA512 d4cf9bda8c437f0c7427ac0d65877fe97939243d0ecd6392e5d1b2f7fdfe902d3cc2062d0d12b1e758307bd226e08286ff83549c3f0d12e106f23e54d4120e77
DIST openjdk-jaxws-9.0.4_p12.tar.bz2 2517916 BLAKE2B 650fbaf93349ce12ba7426e626a6c6e3468183a44f65abb16c139a4b09a2a0d91aed0f9fdfbb7fe779a335a66a003da001229e5504a60396023504ad6c1e3b90 SHA512 459978a5e3ca21910781daed848229e043eea5bd82dcd20e9249934ec97a2a982126c6e37aac1a36719e3b73a5e6c8a92a50b63033149913614d8f3edfc0846e
DIST openjdk-jdk-8.272_p10.tar.bz2 48273590 BLAKE2B 80717a644df7d9741e5786708c816483f4fea1cfeb02438df17fb4183c0702fe6e3fcbeaefcee84a4f847d5cbafb0a9e80af63b56cf0c6381e0fbeb535d2f147 SHA512 85d20763f6cda66f2eac3b2a1e672e6b828c437386575d16a1c70b27a56c718fc0f44c712e6261eb89f6dd273fd2c21a2c4baa3f562cafa2911a5e2467d7ba13
DIST openjdk-jdk-9.0.4_p12.tar.bz2 1648344 BLAKE2B aa7f79939981fd2ecd777d35fe6fcfed4cd52a88e47178de94cffb33880cef2916d55c3edcd8402d13e1248376d66234ee85eb80ef34c365502c3d98f5d5363a SHA512 f7c02476711d7e10c0fb24a4a8e19124a4c2c6267ee8284903f6806b422b6a1e31fea9f60f4f207c7c524c330a89c2e9ee2062bf11f4c63132ff7037caac9d5c
DIST openjdk-jdk-9.0.4_p12.tar.bz2 55469786 BLAKE2B 92f6b30c4c23d99492ff85f61099dcbb4dd1adfc4f4a297801d26e5b0c44be76fb40d482ad0752ac3abdf1d9db0e940a2dd5ba2c5f37d658689147c8eacca26d SHA512 259228d3f439dde239e38cdebb8c3bbb83804ab141d87a9c236310707de9c58cd78cd80ceb4c17755cc1048071f24462839988112c2698f7ec1453a8810610f2
DIST openjdk-langtools-8.272_p10.tar.bz2 2399755 BLAKE2B 34ffa30993fa9f42ed2fa96ae658c3c43ecbc54750c3b854cc90efdbd3c4d5abdda012d55c4e81d4ab805d9184b5ea7429fba5927bf3192fcce2a17d9ef11744 SHA512 54698e8a74119f39971024ee165707fa9e27cd0008b59801f05a194362d723ba67269b1f34c181e2a0b1ce9cd36f52cf3ad3ad980c4670f7cfa476a0fa78fec8
DIST openjdk-langtools-9.0.4_p12.tar.bz2 1709784 BLAKE2B 846e0e527f3a6ead8217b745172991f3de7158567b2e1dc87469d5c0eed1aeb524a22671685212f70283c337087266dabadaa3cd8b0661f7b72590acf3cde940 SHA512 a4361389129570c47d9b7f88437a726035b16e224fde9eb349fa396f7a18d1e15c6f79546caf260776d007013490ea5564ba742aa628ad50d5996e6d410b1b32
DIST openjdk-langtools-9.0.4_p12.tar.bz2 4497608 BLAKE2B 382bfa6119345f1983cf5a168fa0d2e523a6dad5ad35f446cd11d6f6f24bb5850e65d1d0aab7fe8298ba7a2d7fe3ebb8a472c567a46577dff17ab80ea32abae9 SHA512 ef3c70be906a4b0dd9c9195c88da045909ee3ef144941fb7b4495ed66b4162f481095cad87626d2bd38e5a62134b440223cd008dd6123b6b43c00e338610a692
DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa283d2c03be5b28decf12248ec930b9d726e346d0884dd64a22627e2f2fd8260c8755d0bc46a1cf6fecf691a30a7f4b54f6a293a9 SHA512 754fcdca5e0ce523d73cbdfbdcaaa13677ed8c2b72c5ae04ff1cc77fd73469f3366e51add68b13bac3c43800fecfcbb93bf4fcf7469258c4adc57e414b105ef5
DIST openjdk-nashorn-9.0.4_p12.tar.bz2 1668824 BLAKE2B 6c445ccafdc5615a6e7aea7202aff3f46b2ee55b634b482592f0a798f12b8a148c6969811370ce782024e76f1390245faceb2886238d163634b25900d7a40b79 SHA512 e7c1dc2c16730966b7b23e860c51d1b76f6c98487aabfebbd738554d6a092b584adde6b2acfafd244ef4e4d0c8e758273070f1bb741b5950727c988541744424
EBUILD openjdk-10.0.2_p13.ebuild 8231 BLAKE2B 85fe259b435cd0492fcdb59ae7d0d1b1ccdb95484414a53ba00bf03b157209c3a8b3c22dde52bf17a8bcdfe63aea6ba2e9fe463d48b3a445a85429ff4a495b00 SHA512 0607b994918b2d2c6e87aeb3675b81598c3b96d2241eb56799b5a9cfa90ae9c2938be2295fa400263fd49edefd043c8901aafadb5c31a5760d530c988054c0e1
EBUILD openjdk-11.0.9_p11.ebuild 8269 BLAKE2B 0f732f6e074260b7da9c648fc2681ee7a9a609f98ae9aea364a529969be75116d32b4ae4389a8d9a27448cede7a4f01220052dadc41f82fcd75ac040fcedcec9 SHA512 8ce0fe355d3e922c51d8dabd664878496a70e5b03072f7495d2f016f25a6057daf1ec90a0f5d52934d822119ac4b574c57f59516590cda248c13fb52a109f21e
DIST openjdk-nashorn-9.0.4_p12.tar.bz2 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97
EBUILD openjdk-10.0.2_p13.ebuild 8120 BLAKE2B 6fec764700070b41df10f58bb549f043fbcae7a1fe3e80e7b0a0dca69b0d05ef2b6e896306eb9ab173839feb32ca7f1e86c45f0f76fb83fe9bc149d877afb90f SHA512 fa15a5d024c7c6b121604994c029bec3e8b6f1123d9bf6e9d8d4662e1d3479a6ef2832bba730ee52446fdde743959ed41babf218d950f7e973653bb366b42c23
EBUILD openjdk-11.0.9_p11.ebuild 8267 BLAKE2B 0f1f87fe2b582541346c9870c73079a4430853ed6d1665b1ba2bb369d3ade6cd72916e8f36bf0afb0b80d95c6acea3577ca02ba16da6dba2b4b5de9a5aedfbc0 SHA512 175bf0542ea4106dfb1fff50ba9d21b4f91ae0df83c0d4153d0f93f5f078588f722f09061380391a38c886958d4b12acd2a0615cc354064ce573f44b81758635
EBUILD openjdk-12.0.2_p01.ebuild 8436 BLAKE2B dfe25378ceff511abb9fbff5a7753315137ae1878b05f4d5f1581861515719dea8c0c814330413ba6b2bf54062c90b59cf86e7218e5ce179195be2db2845fd4c SHA512 76fbc83bf49e239c611d8f14653abe17d1a416b83d87e9083105bbc5d914b14604bcad2c439aaa17c8819ad07ec438c87b3223e7e6345a7cc728d16dade3af40
EBUILD openjdk-13.0.4_p01.ebuild 8417 BLAKE2B 521f065801713eec3290d6fca3ae224f8fae56c026dedcc9e609d9ad92bf2c21ba195d785b8936a1099bb69109fc744132e8876f8e15dcd85f8304cbf1771c4e SHA512 5c08b3a707929881bdac4b8759851f4f0b80482245890568149adadded1e597a8260e707264cf85ea082f610a1f290ca9a00961f78af38466e433f867bd8a8c9
EBUILD openjdk-14.0.2_p01.ebuild 8419 BLAKE2B cdf793ba4d051f57c89027fca2a42666227974d2d1dc9191d9ef21f18110fa302fa6dfbe0a1daf3a6609e1458319f2a6150c1c07180096f1ccd66206160e77fd SHA512 d18978808c7ee2c530eabe1d749681ad50314366590d7683b39854dee9b07f6a609b115ecfc58e021bda493c0eec8e17ff0178fe3b8261675feaf152b9c97f4a
EBUILD openjdk-15.0.0_p36.ebuild 8645 BLAKE2B 8a4516e98f32bb038b6a5b0123bba4615842c6d19ed1fc1416c71f789d5ca6e366d8a71501d650c3a77304d80f3140a1e437b98b3045186ee538a81307d5f457 SHA512 7e637fae9f756c290479602175f8c9ca5d31a5d75fe69b21fb54e0aba2b559d4329e03f20935b8109a946bcf6063996f6f42a25693c3f2ad62590ff6bbb1a379
EBUILD openjdk-16.0.0_p36.ebuild 8496 BLAKE2B a98e9f85c96b6d0098ce21e337b5764c88c9933eb8abf94c0906430b60a85657360fb903eec0973262a268b8781324deea8d21a9025e91dbdf19796dc07b9c27 SHA512 b02a2fed9ae8ff387ae6691e21f2dba0b3f3cc1c636a9c5ea328f9dd41effb11e809bc77ca0ac84e980f07480413066b1f76f5f3f923d32e290ecb757f8fa687
EBUILD openjdk-17.0.0_p35.ebuild 8437 BLAKE2B 630c114db9825acc447a637fced52c7dd72e272243b71b5c8c154e005d363663479cfa0477357981ebed87d40548b3c179329af26538f12fa16cc83bb17d3718 SHA512 59689cbc3133200fb0bde1cd8e5c113abd5488105e75aaaea6166942067a04710e9326da7a9f2ade02d0fc8308b00ce1d3ce2e902a7a4bbcc15830be8f891b22
EBUILD openjdk-8.272_p10.ebuild 8024 BLAKE2B dfb1d42eaad81e5942cacf16a28286c571c673aa47b3c951a9a42e94bc443e77c2a0b2f8099542e0eff7f8e0b11cca2413efdbd388555d2a0830d859f659dffa SHA512 af55ddfe5a2c39468590ca70216d64e3b211890a662f9bbd064fcec7f61f8e0d151c594653c27554ce49403c8ef0cea7c76e5c635a95121978cda4e7de11aa03
EBUILD openjdk-9.0.4_p12.ebuild 8125 BLAKE2B e69371353d26c4662c69389c86f50820468c09210b5f1700a22a55055034a09c74831288ea5bcfc46ffdea0169007f96ad6bfcce3fca3845644ec5fe6365b171 SHA512 e63191f0cb2feabd909c4df64e5134f07dc4b9b21a16215e5e64ef4c61a5a4b207ea2b83462cd94dbc201df577aeb593d55c8ac92dc506033de0c7c663f96ab1
EBUILD openjdk-8.272_p10.ebuild 8142 BLAKE2B aab86f22139e847331a358065fc42da80385a3cffe937ee5cf68703f242117641f4d89d67bafb396cd2ec908e07be9e5b17b8c98e777308c3293ad9b7b3ca3c7 SHA512 06210cb2ba5f910a32abb400b8c9a6523899f3f23ad5785940e1de8f823d36767556a3af7b542670bef4a18a0f7c9421bbdaa214bcf7f605c49b3e7cc1418b9f
EBUILD openjdk-9.0.4_p12.ebuild 8324 BLAKE2B 4f8244d2297ed6e9d5d73c36a13f41fcb34a49dc1c1dcfb21634dde9d15dd64d55c5a13db8551f8b5d6cebb34f8ef7ad3eed33f801bc5b038fa23b4e582faea1 SHA512 fc8d4c283bcc52146e98bc09992db5cda4697c0973330a77ab51d54dab4b4dd1b4f4d6a9674380cb0e935de25be0719c6194a3413af20646f793cbface0a4c46
MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0

1
dev-java/openjdk/files/bootcycle_jobs.patch
View File

@ -23,4 +23,3 @@ diff -r 21b063d75b3e make/Main.gmk
else
$(call LogWarn, Boot cycle build disabled when cross compiling)
endif

18
dev-java/openjdk/files/patches/9/hello-class-list.patch Normal file
View File

@ -0,0 +1,18 @@
Workaround for:
Exception in thread "main" java.lang.NoSuchFieldError: preferIPv6Address
at java.base@9.0.4-internal/java.net.InetAddress.init(Native Method)
at java.base@9.0.4-internal/java.net.InetAddress.<clinit>(InetAddress.java:336)
at build.tools.classlist.HelloClasslist.main(HelloClasslist.java:60)
--- a/jdk/make/src/classes/build/tools/classlist/HelloClasslist.java 2021-12-07 19:18:50.615675432 +0000
+++ b/jdk/make/src/classes/build/tools/classlist/HelloClasslist.java 2021-12-07 19:19:28.706564894 +0000
@@ -56,8 +56,7 @@
public static void main(String ... args) {
- List<String> strings = Arrays.asList("Hello", "World!", "From: ",
- InetAddress.getLoopbackAddress().toString());
+ List<String> strings = Arrays.asList("Hello", "World!");
String helloWorld = strings.parallelStream()
.map(s -> s.toLowerCase(Locale.ROOT))

0
dev-java/openjdk/files/musl/9/make-4.3.patch → dev-java/openjdk/files/patches/9/make-4.3.patch
View File

22
dev-java/openjdk/files/patches/9/pointer-comparison.patch Normal file
View File

@ -0,0 +1,22 @@
--- a/hotspot/src/share/vm/opto/lcm.cpp 2021-12-07 16:13:19.886088657 +0000
+++ b/hotspot/src/share/vm/opto/lcm.cpp 2021-12-07 16:13:29.616313463 +0000
@@ -39,7 +39,7 @@
// Check whether val is not-null-decoded compressed oop,
// i.e. will grab into the base of the heap if it represents NULL.
static bool accesses_heap_base_zone(Node *val) {
- if (Universe::narrow_oop_base() > 0) { // Implies UseCompressedOops.
+ if (Universe::narrow_oop_base() != 0) { // Implies UseCompressedOops.
if (val && val->is_Mach()) {
if (val->as_Mach()->ideal_Opcode() == Op_DecodeN) {
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that
--- a/hotspot/src/share/vm/memory/virtualspace.cpp 2021-12-07 16:43:02.367393462 +0000
+++ b/hotspot/src/share/vm/memory/virtualspace.cpp 2021-12-07 16:43:24.457906864 +0000
@@ -581,7 +581,7 @@
assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size],
"area must be distinguishable from marks for mark-sweep");
- if (base() > 0) {
+ if (base() != 0) {
MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap);
}
}

28
dev-java/openjdk/openjdk-10.0.2_p13.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -15,7 +15,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.
LICENSE="GPL-2"
KEYWORDS="amd64 arm64"
IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap +webstart"
IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap +webstart"
COMMON_DEPEND="
media-libs/freetype:2=
@ -68,7 +68,6 @@ DEPEND="
PDEPEND="
webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
"
REQUIRED_USE="javafx? ( alsa !headless-awt )"
@ -133,19 +132,19 @@ pkg_setup() {
src_prepare() {
default
# conditionally apply patches for musl compatibility
if use elibc_musl; then
eapply "${FILESDIR}/musl/${SLOT}/build.patch"
eapply "${FILESDIR}/musl/${SLOT}/fix-bootjdk-check.patch"
# conditionally apply patches for musl compatibility
if use elibc_musl; then
eapply "${FILESDIR}/musl/${SLOT}/build.patch"
eapply "${FILESDIR}/musl/${SLOT}/fix-bootjdk-check.patch"
eapply "${FILESDIR}/musl/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/musl/${SLOT}/ppc64le.patch"
eapply "${FILESDIR}/musl/${SLOT}/aarch64.patch"
fi
eapply "${FILESDIR}/musl/${SLOT}/ppc64le.patch"
eapply "${FILESDIR}/musl/${SLOT}/aarch64.patch"
fi
# conditionally remove not compilable module (hotspot jdk.hotspot.agent)
# this needs libthread_db which is only provided by glibc
#
# haven't found any way to disable this module so just remove it.
# conditionally remove not compilable module (hotspot jdk.hotspot.agent)
# this needs libthread_db which is only provided by glibc
#
# haven't found any way to disable this module so just remove it.
if use elibc_musl; then
rm -rf "${S}"/src/jdk.hotspot.agent || die "failed to remove HotSpot agent"
fi
@ -280,4 +279,3 @@ pkg_postinst() {
ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
fi
}

4
dev-java/openjdk/openjdk-11.0.9_p11.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -15,7 +15,7 @@ HOMEPAGE="https://openjdk.java.net"
SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
KEYWORDS="amd64 ~arm arm64 ~ppc64"
IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"

8
dev-java/openjdk/openjdk-8.272_p10.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -124,6 +124,12 @@ pkg_setup() {
src_unpack() {
default
# Delete pre-built files
find . -name '*.jar' -delete
find . -name '*.bin' -delete
find . -name '*.exe' -delete
mv -v "jdk${SLOT}u"* "${P}" || die
local repo

27
dev-java/openjdk/openjdk-9.0.4_p12.ebuild
View File

@ -25,7 +25,7 @@ SRC_URI="
LICENSE="GPL-2"
KEYWORDS="amd64 arm64"
IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap +pch selinux source +webstart"
COMMON_DEPEND="
media-libs/freetype:2=
@ -63,12 +63,8 @@ DEPEND="
x11-libs/libXt
x11-libs/libXtst
|| (
dev-java/openjdk-bin:${SLOT}
dev-java/icedtea-bin:${SLOT}
dev-java/openjdk:${SLOT}
dev-java/icedtea:${SLOT}
dev-java/openjdk-bin:$((SLOT-1))[gentoo-vm]
dev-java/icedtea-bin:$((SLOT-1))
dev-java/openjdk:$((SLOT-1))
dev-java/icedtea:$((SLOT-1))
)
@ -76,7 +72,6 @@ DEPEND="
PDEPEND="
webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
"
S="${WORKDIR}/${PN}-${PV}"
@ -103,7 +98,7 @@ pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-bin-$((SLOT-1)) icedtea-${SLOT} icedtea-bin-${SLOT} openjdk-$((SLOT-1)) openjdk-bin-$((SLOT-1)) icedtea-$((SLOT-1))"
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} icedtea-${SLOT} openjdk-$((SLOT-1)) icedtea-$((SLOT-1))"
JAVA_PKG_WANT_SOURCE="${SLOT}"
JAVA_PKG_WANT_TARGET="${SLOT}"
@ -149,13 +144,17 @@ src_unpack() {
src_prepare() {
default
# Delete pre-built files
find . -name '*.jar' -type f -delete
find . -name '*.bin' -type f -delete
find . -name '*.exe' -type f -delete
chmod +x configure || die
# conditionally apply patches for musl compatibility
if use elibc_musl; then
eapply "${FILESDIR}/musl/${SLOT}/build.patch"
eapply "${FILESDIR}/musl/${SLOT}/fix-bootjdk-check.patch"
eapply "${FILESDIR}/musl/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/musl/${SLOT}/ppc64le.patch"
eapply "${FILESDIR}/musl/${SLOT}/aarch64.patch"
fi
@ -169,7 +168,11 @@ src_prepare() {
fi
# https://bugs.openjdk.java.net/browse/JDK-8201788
epatch "${FILESDIR}/bootcycle_jobs.patch"
eapply "${FILESDIR}/bootcycle_jobs.patch"
# https://bugs.openjdk.java.net/browse/JDK-8237879
eapply "${FILESDIR}/patches/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/patches/${SLOT}/pointer-comparison.patch"
eapply "${FILESDIR}/patches/${SLOT}/hello-class-list.patch"
}
src_configure() {
@ -184,10 +187,12 @@ src_configure() {
--disable-warnings-as-errors
--enable-unlimited-crypto
--with-boot-jdk="${JDK_HOME}"
--with-extra-cflags="${CFLAGS}"
--with-extra-cxxflags="${CXXFLAGS}"
--with-extra-cflags="${CFLAGS} -fcommon -fno-delete-null-pointer-checks -fno-lifetime-dse"
--with-extra-cxxflags="${CXXFLAGS} -fcommon -fno-delete-null-pointer-checks -fno-lifetime-dse"
--with-extra-ldflags="${LDFLAGS}"
--with-giflib=system
--disable-hotspot-gtest
--disable-freetype-bundling
--with-jtreg=no
--with-jobs=1
--with-num-cores=1