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

openjdk-10: add GCC10 fixes.

This commit is contained in:
Andrius Štikonas 2021-12-18 11:27:04 +00:00
parent c94bcf3ee5
commit 53e10e5708
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev-java/openjdk/Manifest
View File

@ -59,6 +59,7 @@ AUX openjdk-7.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd
AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
AUX openjdk-9.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
AUX patches/10/make-4.3.patch 741 BLAKE2B 6dab3601e6a6260f9813fab663211d8afe7fc08ff1af243bbd8ad90f8c58df5c713aec5cea7788eeabee9fce17e0aec5cf9b6f19becd5baf37a772773a445b36 SHA512 7d6ada121fbd7a4b29459b000fca225b3fb7d95d855459d43749d6ece60b8282418bd349cf235ccd41b86ac36b158e81f3184884883a551c240cb30dfe66fccd
AUX patches/10/pointer-comparison.patch 471 BLAKE2B 807c0970dc766d5fea54b8af1d2d0cdddfe75368bca32c6a8cb2c516db21c5e8056fce7715eb1b33ece68970ce6e0686bd061194ac2829432ad44da010767858 SHA512 48faf682eeb2d57873148d3fd948c66d20eebab360ce31352761ff5400bafbeca55a85dded04c38a0e4263d14521b4da41fd02b608b774e4d8e3784452c5c847
AUX patches/16/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
AUX patches/17/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
AUX patches/9/aarch64_gcc_fix.patch 377 BLAKE2B b94336be65f16831c63cb3288d71b48c9c0c12e91a3612501895b924791d41c94eae1cae35e64ff03f7ba873463d78fff09652c4fe2f0bc749697d82f9ea4e8b SHA512 d4666e419559b10d4d2c0b3ec7b10ce6607e8480ffac6a8685263e0997d8bd43b059244f1beb452759a8a2e86a867d03e5e44793b62b2fe0a4a3dc00a5dd6ad9
@ -97,7 +98,7 @@ DIST openjdk-langtools-8.272_p10.tar.bz2 2399755 BLAKE2B 34ffa30993fa9f42ed2fa96
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 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97
EBUILD openjdk-10.0.2_p13.ebuild 8123 BLAKE2B 7ba47ef8b888b78d6d149623152891b7d4cd22c8edf3ddb29deda11a6a48b6c3171af5fb2ac68b7d49e58a787871c056f3367ddac0f7302938a6fd734db410bb SHA512 7890b7605348364d3698420fc60a216b6bbfe6f2d147d63dea3dae51a78540cffdd320a314006125fdfab373997478b1173dd2b3eb62e830666639bfeed6e5a1
EBUILD openjdk-10.0.2_p13.ebuild 8236 BLAKE2B 535ed3dadee9561637b341c39901ae40ae6fd1ae6c5d834c53a73be0ac8aa185c2bbef2ff36241acab5241507a8bc0de486b2f76f3f2672e483325a02216ca01 SHA512 8fdc8ddbfc9d21497da55a6d6990ed3eba85d9e39a1a9d8aa353da1178517fcd7774b2103d7cc66992d1339b32488bbf368e9a173103d5e10959b5608ea60961
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

13
dev-java/openjdk/files/patches/10/pointer-comparison.patch Normal file
View File

@ -0,0 +1,13 @@
--- a/src/hotspot/os/linux/os_linux.cpp.orig 2021-12-18 01:55:50.855099344 +0000
+++ b/src/hotspot/os/linux/os_linux.cpp 2021-12-18 01:56:38.996375936 +0000
@@ -2155,7 +2155,7 @@
}
p = OSContainer::cpu_cpuset_memory_nodes();
- if (p < 0)
+ if (p != 0)
st->print("cpu_memory_nodes() failed\n");
else {
st->print("cpu_memory_nodes: %s\n", p);
// This assumes all Decodes with TypePtr::NotNull are matched to nodes that

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

@ -149,6 +149,7 @@ src_prepare() {
fi
eapply "${FILESDIR}/patches/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/patches/${SLOT}/pointer-comparison.patch"
chmod +x configure || die
}
@ -165,9 +166,10 @@ src_configure() {
--disable-ccache
--enable-full-docs=no
--with-boot-jdk="${JDK_HOME}"
--with-extra-cflags="${CFLAGS}"
--with-extra-cflags="${CFLAGS} -fcommon -fno-delete-null-pointer-checks -fno-lifetime-dse"
--with-extra-cxxflags="${CXXFLAGS}"
--with-extra-ldflags="${LDFLAGS}"
--disable-warnings-as-errors
--with-giflib=system
--with-lcms=system
--with-libjpeg=system
@ -214,7 +216,7 @@ src_compile() {
emake -j1 \
$(usex doc docs '') \
$(usex jbootstrap bootcycle-images product-images) \
JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
JOBS=$(makeopts_jobs) LOG=debug
}
src_install() {