summaryrefslogtreecommitdiff
path: root/dev-java/openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/openjdk')
-rw-r--r--dev-java/openjdk/Manifest25
-rw-r--r--dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch12
-rw-r--r--dev-java/openjdk/metadata.xml2
-rw-r--r--dev-java/openjdk/openjdk-11.0.24_p8.ebuild (renamed from dev-java/openjdk/openjdk-11.0.23_p9.ebuild)7
-rw-r--r--dev-java/openjdk/openjdk-17.0.12_p7.ebuild (renamed from dev-java/openjdk/openjdk-17.0.11_p9.ebuild)7
-rw-r--r--dev-java/openjdk/openjdk-21.0.4_p7.ebuild (renamed from dev-java/openjdk/openjdk-21.0.3_p9.ebuild)16
-rw-r--r--dev-java/openjdk/openjdk-23_p37.ebuild (renamed from dev-java/openjdk/openjdk-17.0.10_p7.ebuild)41
-rw-r--r--dev-java/openjdk/openjdk-8.402_p06-r2.ebuild284
-rw-r--r--dev-java/openjdk/openjdk-8.422_p05.ebuild (renamed from dev-java/openjdk/openjdk-8.412_p08.ebuild)2
9 files changed, 77 insertions, 319 deletions
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 2989583ce2ad..10df6ee9ceba 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,3 +1,4 @@
+AUX openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch 608 BLAKE2B ae49ac440d0f3c73f9afb31f4b80ba18fb739ee914841d31919827ecfcb7962ed2a7388897091b443ff57b241abd2faa0e8138fb37288f6f43a1e9befe0f5335 SHA512 1e4bb26489f72a1c40d1032ce76ecce3f30b22e33cb0e05bba8abbd4accddf951423fc16a0e747af03bdb9f3d036868b87e8d09c1a969b27d223653e4dcd926f
AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
AUX openjdk-8.402_p06-0001-Fix-Wint-conversion.patch 1457 BLAKE2B bf40827358b66f4f74ed506daec28f90c2c36609e28bbdd1a1df289a7a7b6b837c58f4978fffd18e580e0d49a6caaba31e54c3fcfbc66a218203cc2e05ec595d SHA512 4c2c9a6b99f833318fdd955ad015813326f8f9a5ad7e5327b74ccd2b638f1c7f8935223c3a1af26946f470b5d7c19ac130c72291b3a5ce0ec4a729df3a3915b9
AUX openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch 2254 BLAKE2B 6e8e008b6735262d9447605e60fbf0a5937068d5efbac014dad86910d55320cba048b88dd2a4436bcac407d1660137f94eab037b8b99453c9a5cf6721e22f4bc SHA512 8f6659dcbc63c0fa637a636b0e09141a09eecb31e2296f863f3446ce1c820922d2be12063822f6b12ce4702e920fcd5a6573494e4b88224cd3505be46574e8ba
@@ -6,12 +7,11 @@ AUX openjdk-8.402_p06-0004-Fix-misc.-warnings.patch 3075 BLAKE2B 8da8de4830a4545
AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21ac5db06cde111d325903e70b5b7473659973a0bab972386c8f33ded1da57858fdca325cfa29b1122f5 SHA512 a43fc0fcf57108350235d47d6da65a12fb9f77f12f6163c649ceceacb3317c6a25516efa060efe129b74138a529945163343e5a7d1de2b7af36f6580054ed5e5
AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd
DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f2823772a5d9a18447a435f191daf78c5429a15c2e9ea64758dc9b26ee2a88275532b4f27714b2a7e4489f920c0ed2f5003b SHA512 c0426f243c5aa581d90366cb01ce811e34883a9d8a0298cab420378470e8eb427a56932ca1fbb5ed57e7430be2b38c6bc4491028ebaa25be0a938ba0bb2baf45
-DIST openjdk-11.0.23_p9.tar.gz 116316363 BLAKE2B a3745b2afe9d2529daf89aceed43025aca72a353210b0987aacb32af971262077411e9a2b6cfd938ca9d0c93c8762759b9207a13cee0808288674671164e3a36 SHA512 3851063289042ed467a9cb636eba7170a0feeaa3e5d19bda6c30a186ea624e4ae1b308006652acb9c9820c2065382bd719ee130b7a1a0524fe25ecd639f8a51d
-DIST openjdk-17.0.10_p7.tar.gz 106398664 BLAKE2B 48cb2bc7d063da25a62834734ba4a887d26a27a8d84c535255df67419bf4f6d8b060c48ef37bd7324e14e957a141791380d4d9e42335a90f72dc34bc7b1d12fe SHA512 c2dfd66debdce488de044efcfc3f57cc9eb07ead2cfb7dd6e28e5748d48ec89f0c326a4c3f4a5c740019b8e5a02b858d93dd74a0c6626de445144b9840d3a426
-DIST openjdk-17.0.11_p9.tar.gz 106574173 BLAKE2B 3db4763527d1acb83a2d492c3e94dc571065b844cf2ac56b7377a821cf2cb48af405b9fef73f477502bedc2c119ac57a115315140af04d51dbab5a78dfa6c789 SHA512 77baa3ec3ff2d06b28121342357311d1d5ca2ddd9ac7982b1aa5fc745b49519d2f95d14226ad4ac413d9a0ecf0e49d15078cabbba0b2897d0c6883b92ef0b5e9
-DIST openjdk-21.0.3_p9.tar.gz 112404688 BLAKE2B e73688fdd2e4f4da144f66058e4ff68da4a557d9c7693c7854ba6c7e1a12155abec4aa0fcd724f62333060c4b4f7488f827c1b5499fe5667743516101f7f2fa6 SHA512 efc2d03a7e7afed62a2cdc9f7707d056ed62d63f513394d7e3c6bbe11980ac492a2cad144021cea4180f4c93f1a481bdd65cb61156023a3f14ba596fd9c0eb60
-DIST openjdk-8.402_p06.tar.gz 93136112 BLAKE2B 023422ca2b4dfc08fd3642e3cb3ec0503d57d09dbcb54841e4a04f67a6cd118712cba90b7760eaf9135f9f001f7c15221c4bcb19986547fb2b6b3fb852bb8af4 SHA512 476d195ef500d8dd2013b17de0669a77ef8076b55c2753eb88b1a13f7a48526b1be7a1befabd284eb9ee8411df19ab1f39c81287ab659984d2d67e8aa7192d79
-DIST openjdk-8.412_p08.tar.gz 93003614 BLAKE2B 71a3825bf69bb196ae219f5125e8452f634be2ff7b9f42a4829f6581f0a143bfec95013971c6f6b8f402c11efa34443f55a7f89d4133eac0b05a6d1cd6e0324d SHA512 d198f26474a4bd0b5e09c3c3aa53fbf77f217b8cd23499f7e661224048e925e0e020b28264b6ce7401baf83f8ffd8e3247788e2f5e7188509dea8b06f9fa0572
+DIST openjdk-11.0.24_p8.tar.gz 116418943 BLAKE2B cb768b202b42f426f4edaead16ba09800d86c10da4a664176842ee396332284d410191a55dbb35d7604272231e5b3daf8a75ddc03bb819d670622b7682eec7f6 SHA512 ce45efd934b9bacc56c468d92083a85de311b4436a519ae1d6038aff025c2fa8a811abca4cdd99aeb8c09455effff53500f96c287976cd2ae90d4e11da2385a3
+DIST openjdk-17.0.12_p7.tar.gz 106597045 BLAKE2B f0e9baec472ecefbf28359abfc10757dc7cb2a6ddf8428086a6565831f1c13ee1a7cdb87b67d6b3840860ddbf2c74e80ece55f09238fddc2cb8fa77208695b9b SHA512 cc99e9742123f7d8ac7ad78abab0fbe5cff37999b9c06ad14851009a95c9868968e97dd0f3e4dea8bfa8578f8f903fccaa37134466a778375cdf24344138f1fc
+DIST openjdk-21.0.4_p7.tar.gz 112506384 BLAKE2B d58636bc9221d56afcf118a91e41326d2e086c9fe22675429ec50d0b62fefd9e2040140a9d99682547e8bf0d40fa4ca2cbcdf8be55b9a0556b95c90fc0a08d56 SHA512 507524d842fb7c371cf7d3163cdce87e9266d613998b797f2828178b35c087354ae30941384d5afd1d6e3982eddf5c9067553bc2b918a9e223b93893f7f27e76
+DIST openjdk-23_p37.tar.gz 116630157 BLAKE2B 38f1beed2f840b89aa7375cda657cd769472324a52293a11911f4b96cb62a5a6882814c0d31a0fbde560ac167468afd6bbee84389f0c61956ad80596702214d0 SHA512 1f03849cdb1a603848de0516ac2f736f4665efee4bc9a67b66b1e3a8138fa2dcf1828471b423585f07be3ffa94e6bdbd5752bbc456b8bd0306a8cb30d6127754
+DIST openjdk-8.422_p05.tar.gz 93034877 BLAKE2B 2489fea62fbc5a7e3735055656ae89c67caf63e5bc6d5385ee811d0707d056bc3d10dd83f7eae5a5a86b7f57b8da47a9c1a77405f127b6f506bbf3b310ecd2ae SHA512 706db67f9be7509380e96ae2187bdb928e40c4382fd7073dd310da2981eeff324a5871702b087d4466911dbbea8376d5f9fed7029562ca62c9a1a193d931833e
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
@@ -23,10 +23,9 @@ DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc7
DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c
DIST openjdk-bootstrap-8.402_p06-ppc64.tar.xz 34476368 BLAKE2B 1f896772f5e40a2793c5d9294e65e429c94204f91e91bfd76ff780e1d6318741c2052c3f20e59abcfb7018924983b5c9f386f14f912660e3e86296185f348482 SHA512 7bace068c5ac7604ad9db3ed655a52a4a90195efbf2fc342389cf7929d82d3f7b861fe700c16f513599bf9c064a87c9aa5966d7bd45aa7ed5e55ec317667be6a
DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5
-EBUILD openjdk-11.0.23_p9.ebuild 8835 BLAKE2B bea1b8c33090c4990cd5c9c8954273b76b5ffb68c68a41959b98367f83f1ccbb398050de0866a18ba3ff7ef6c1dcabcd3add6f68ea8d9ebf1b5b3743fa65e0e1 SHA512 b8f3ad74db69fe48d8ab347d6ff5fdf81271b83aa25fd94c15630bc2c7e265ed73a710803e4098ff8451f2443c4344dfd02f4e73135f4c535733ac069f3eeb35
-EBUILD openjdk-17.0.10_p7.ebuild 9283 BLAKE2B fcdb81446a814cf213988b4278d3ca2d8e1f751754bd134e5e06f02a30ed9c1152a6b28f08064320f4134db9a1df819f23530eb75e5c339525d1c27320a58f3b SHA512 3b5293ccb458d564cd6dd54000edb397aba05c633b4d5ef47fe571d70570e7e4a08af67c76c492f314321ff2ca80775b551bfb3e3a52f8b09a8a6fd6a6863402
-EBUILD openjdk-17.0.11_p9.ebuild 9258 BLAKE2B 499c3e6fdbb6d956457ec61cbf05091466e3378f57f5aedb3472a7636734ace6e8e18455402d35ad5765f8ad8007e8f733d41a80eab9c397fed196a436deaa3f SHA512 61dbc61daa884bafce6440846a7a458dfaaf65fc0c0bba3c4a62688dfb512361bcc8bfd9820cb1678eb6baf1fc98817851fdb03930581e387accd0943f7b0880
-EBUILD openjdk-21.0.3_p9.ebuild 9222 BLAKE2B a99c8167af247502103af8adccc900ee8cf2a426eb62b506fd44369de32a63b48e22081112de3c65b9b07287a8bd5225d2e87aa80dc8eec3bf37e6a4580d71c9 SHA512 1e001792d4a317b2f68e7a5a888c119c297c74780af7784c30e419ea6361d0e3601c07cca16429635d606336dc1dd8c84e924163bd2a259de9cb4ceda9aea45a
-EBUILD openjdk-8.402_p06-r2.ebuild 7849 BLAKE2B b140bbfe653b618663d798666e72ee0f5096f74c708d5fa34f58ccfeccc4a918126a2fb6c46cbe9fa55b1edbafa76d8972a9dfb8fc0a9a90a81dca903eee51e2 SHA512 fb0cdfda5a8b2d5a2c1ced6150df3b86bb34971e1f155682cd0e48f558067f35d32b248c2bcb05a2416b179de522d2fb6a7ce1a9084f76ce167d5ea042443681
-EBUILD openjdk-8.412_p08.ebuild 7823 BLAKE2B df25782738aa40faf91a4eac7b06eef4ddb8d7cfd1d2a2ae05c42f63eac88a37e51e788e2ebcbbcd54fb491f35c7b26e5c98a675415483aa70f9eecda735291b SHA512 345aa3c92e51568a88f36cd6669ed7c6ae4b7f12c0c74b378ffaba29d086a3f02af62839d212277579f2e1e282bffe112bc49a0031fd2884c05bee7489a3980b
-MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de
+EBUILD openjdk-11.0.24_p8.ebuild 9003 BLAKE2B e8b0c87b9fb1322893cb137cf7eb94c29e0b4d33720d40d464c5d4c171297642eedcbcb66f637c963c07d83db84d551f7d536e5ba6c8510f6140f6051fa15134 SHA512 3ed25ec77e46faf8843085a3eceabf801a242ed0471eed32d344c871cb1e006477009d9a19db748ff1fd083ac0b7874f364d48360ee258bb57e3bdfcdd79227b
+EBUILD openjdk-17.0.12_p7.ebuild 9423 BLAKE2B 269c2108f9807cac55c140e93901566537d99c865238da907be7e2542664eebde575e02fa425414e786cde43ec804937819e4311036ac9b74c4c81cce964b0fc SHA512 d1c49ce3d13496a945a362fe52b1b6cebe43280b82e41a32180c077e0c9c0e60ef5f4c752a3288331ac33e659e92bdb98f7e54c64d31414cdb600161766c68df
+EBUILD openjdk-21.0.4_p7.ebuild 9534 BLAKE2B 16ec3a58ac789c46f3527b72da86a282916e9dc9774f8fbddea40a66763f35eebbb545493682f869ecf03bb3d2d86829bb3d0c7e2c61ec879d9c722eb6a9806d SHA512 3ed2814c35176848b3ec882f2c679c62be126091945008a12945041d24bc6e2941bcd6c975661c9dde6bfbd596a702123c017a7f74d9b79deadf9aa87ce37b4a
+EBUILD openjdk-23_p37.ebuild 9596 BLAKE2B d07179bb04a9cae85f1c89f7271a960d6a6df7a65376ce50f9358e99f686849722b4ff1f39a045e971400e5a7ab08ee41daa0c5b0413261cc663bbfb644d2204 SHA512 2e655c7bfffa213f6e88cb9fbd4dc258bf48b849d65335ca2f16928a42d213b33482e7057d0d150e915d33b4fc5e12c701acafd9d97de6b7599a3c6c0f1c1b88
+EBUILD openjdk-8.422_p05.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
+MISC metadata.xml 1549 BLAKE2B 6c922cbe1dd4261036670a176be092d495024dd25e2ffb83cc1af1e3ad0dda3491e8973cdd7f8688f1c0854acf55cdc11e9d80ac5b9a16b544455d2cd1bdcbfe SHA512 57cd1a08f0479e8b11d37665c1d905255685ed2d8d27f469a9689ffe070c7ee6cd5944a1baf87cb19722b31af56b1a4692f7967e817d1e4ffbf7c4d97881d838
diff --git a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch b/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
new file mode 100644
index 000000000000..bc4d96dfc141
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
@@ -0,0 +1,12 @@
+src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c:27:10: fatal error: hb.h: No such file or directory
+
+--- jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk~ 2024-08-20 17:57:04.000000000 +0200
++++ jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk 2024-09-20 10:00:52.460817053 +0200
+@@ -279,6 +279,7 @@ endif
+ ################################################################################
+
+ ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
++ LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
+ LIBFONTMANAGER_EXTRA_SRC =
+ LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
+ else
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index 543587cc5399..095cbbb07ad6 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -21,7 +21,7 @@
<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
<flag name="source">Install JVM sources</flag>
<flag name="system-bootstrap">Bootstrap using installed openjdk</flag>
- <flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
+ <flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTap/DTrace tracing</flag>
</use>
<upstream>
<remote-id type="github">openjdk/jdk8u</remote-id>
diff --git a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
index 60f9354ff576..777fecd885e4 100644
--- a/dev-java/openjdk/openjdk-11.0.23_p9.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
@@ -228,6 +228,11 @@ src_configure() {
fi
fi
+ # Workaround for bug #938302
+ if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+ myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+ fi
+
if use !system-bootstrap ; then
addpredict /dev/random
addpredict /proc/self/coredump_filter
@@ -302,7 +307,7 @@ src_install() {
if use doc ; then
docinto html
dodoc -r "${S}"/build/*-release/images/docs/*
- dosym8 -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+ dosym -r /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}
diff --git a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
index 1c4f51f66acd..90f9a664d446 100644
--- a/dev-java/openjdk/openjdk-17.0.11_p9.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
@@ -50,7 +50,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
@@ -237,6 +237,11 @@ src_configure() {
fi
fi
+ # Workaround for bug #938302
+ if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+ myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+ fi
+
if use !system-bootstrap ; then
addpredict /dev/random
addpredict /proc/self/coredump_filter
diff --git a/dev-java/openjdk/openjdk-21.0.3_p9.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
index 943ac23576da..bb3ad26ff08a 100644
--- a/dev-java/openjdk/openjdk-21.0.3_p9.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
@@ -46,9 +46,10 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
SLOT="${MY_PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source +system-bootstrap systemtap"
+# lto temporarily disabled due to https://bugs.gentoo.org/916735
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
@@ -225,7 +226,11 @@ src_configure() {
use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
- use lto && myconf+=( --with-jvm-features=link-time-opt )
+ # Werror=odr
+ # https://bugs.gentoo.org/916735
+ #
+ # Disable it for now.
+ #use lto && myconf+=( --with-jvm-features=link-time-opt )
if use javafx; then
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
@@ -236,6 +241,11 @@ src_configure() {
fi
fi
+ # Workaround for bug #938302
+ if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+ myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+ fi
+
if use !system-bootstrap ; then
addpredict /dev/random
addpredict /proc/self/coredump_filter
diff --git a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild b/dev-java/openjdk/openjdk-23_p37.ebuild
index 0b834a1a41a4..47f8df8e9c6c 100644
--- a/dev-java/openjdk/openjdk-17.0.10_p7.ebuild
+++ b/dev-java/openjdk/openjdk-23_p37.ebuild
@@ -1,15 +1,13 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
# variable name format: <UPPERCASE_KEYWORD>_XPAK
-ARM64_XPAK="17.0.2_p8" # musl bootstrap install
-PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
-RISCV_XPAK="17.0.3_p7"
-X86_XPAK="17.0.1_p12"
+PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
+X86_XPAK="21.0.0_p35"
# Usage: bootstrap_uri <keyword> <version> [extracond]
# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
@@ -33,29 +31,31 @@ bootstrap_uri() {
# to exact same commit sha. we should always use the full version.
# -ga tag is just for humans to easily identify General Availability release tag.
MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
DESCRIPTION="Open source implementation of the Java programming language"
HOMEPAGE="https://openjdk.org"
SRC_URI="
- https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
+ https://github.com/${PN}/jdk23u/archive/jdk-${MY_PV}.tar.gz
-> ${P}.tar.gz
!system-bootstrap? (
- $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
$(bootstrap_uri x86 ${X86_XPAK})
- $(bootstrap_uri riscv ${RISCV_XPAK})
)
"
+S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
+# SLOT="${MY_PV%%[.+]*}"
+SLOT="23"
+# KEYWORDS="" # not LTS
-IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap lto selinux source system-bootstrap systemtap"
+# lto temporarily disabled due to https://bugs.gentoo.org/916735
+IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source +system-bootstrap systemtap"
REQUIRED_USE="
javafx? ( alsa !headless-awt )
!system-bootstrap? ( jbootstrap )
+ !system-bootstrap? ( || ( ppc64 x86 ) )
"
COMMON_DEPEND="
@@ -110,7 +110,7 @@ DEPEND="
)
"
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
+PATCHES=( "${FILESDIR}/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch" )
# The space required to build varies wildly depending on USE flags,
# ranging from 2GB to 16GB. This function is certainly not exact but
@@ -227,7 +227,13 @@ src_configure() {
$(tc-is-clang && echo "--with-toolchain-type=clang")
)
- use lto && myconf+=( --with-jvm-features=link-time-opt )
+ use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
+
+ # Werror=odr
+ # https://bugs.gentoo.org/916735
+ #
+ # Disable it for now.
+ #use lto && myconf+=( --with-jvm-features=link-time-opt )
if use javafx; then
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
@@ -238,6 +244,11 @@ src_configure() {
fi
fi
+ # Workaround for bug #938302
+ if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
+ myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
+ fi
+
if use !system-bootstrap ; then
addpredict /dev/random
addpredict /proc/self/coredump_filter
@@ -297,7 +308,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+ dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
# must be done before running itself
java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild b/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
deleted file mode 100644
index 84a8a1eeb9d6..000000000000
--- a/dev-java/openjdk/openjdk-8.402_p06-r2.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
-
-# don't change versioning scheme
-# to find correct _p number, look at
-# https://github.com/openjdk/jdk${SLOT}u/tags
-# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
-# to exact same commit sha. we should always use the full version.
-# -ga tag is just for humans to easily identify General Availability release tag.
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
-SLOT="${PV%%[.+]*}"
-
-# variable name format: <UPPERCASE_KEYWORD>_XPAK
-X86_XPAK="8.402_p06"
-PPC64_XPAK="8.402_p06"
-
-# Usage: bootstrap_uri <keyword> <version> [extracond]
-# Example: $(bootstrap_uri x86 8.402_p06)
-# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.tar.xz ) )
-bootstrap_uri() {
- local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
- local suff="tar.xz"
- local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
- local ver="${2:?${FUNCNAME[0]}: version not specified}"
- local cond="${3-}"
-
- # here be dragons
- echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })"
-}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.org"
-SRC_URI="
- https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz
- -> ${P}.tar.gz
- !system-bootstrap? (
- $(bootstrap_uri x86 ${X86_XPAK})
- $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
- )
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 arm64 ppc64 x86"
-IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- system-bootstrap? (
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- )
- )
-"
-
-BDEPEND="
- virtual/pkgconfig
-"
-
-PDEPEND="javafx? ( dev-java/openjfx:${SLOT} )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/openjdk-8-insantiate-arrayallocator.patch"
- "${FILESDIR}/openjdk-8.402_p06-0001-Fix-Wint-conversion.patch"
- "${FILESDIR}/openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch"
- "${FILESDIR}/openjdk-8.402_p06-0003-Fix-negative-value-left-shift.patch"
- "${FILESDIR}/openjdk-8.402_p06-0004-Fix-misc.-warnings.patch"
-)
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- if [[ ${MERGE_TYPE} != binary ]]; then
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
- fi
-}
-
-pkg_setup() {
- openjdk_check_requirements
- java-vm-2_pkg_setup
-
- [[ ${MERGE_TYPE} == "binary" ]] && return
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- if use system-bootstrap; then
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then
- java-pkg-2_pkg_setup
- return
- fi
- done
- fi
-}
-
-src_prepare() {
- default
-
- # new warnings in new gcc https://bugs.gentoo.org/685426
- sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
- hotspot/make/linux/makefiles/gcc.make || die
-
- chmod +x configure || die
-}
-
-src_configure() {
- if ! use system-bootstrap; then
- local xpakvar="${ARCH^^}_XPAK"
- export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
- fi
-
- # general build info found here:
- # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
- # -Wregister use (bug #918655)
- append-cxxflags -std=gnu++14
-
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Strip some flags users may set, but should not. #818502
- filter-flags -fexceptions
-
- # Strip lto related flags, no support in this version.
- # https://bugs.gentoo.org/833097
- # https://bugs.gentoo.org/833098
- filter-lto
- filter-flags -fdevirtualize-at-ltrans
-
- tc-export_build_env CC CXX PKG_CONFIG STRIP
-
- local myconf=(
- --disable-ccache
- --disable-freetype-bundling
- --disable-precompiled-headers
- --enable-unlimited-crypto
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
- --with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
- --with-giflib="${XPAK_BOOTSTRAP:-system}"
- --with-jtreg=no
- --with-jobs=1
- --with-num-cores=1
- --with-update-version="$(ver_cut 2)"
- --with-build-number="b$(ver_cut 4)"
- --with-milestone="fcs" # magic variable that means "release version"
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-zlib="${XPAK_BOOTSTRAP:-system}"
- --with-native-debug-symbols=$(usex debug internal none)
- $(usex headless-awt --disable-headful '')
- $(tc-is-clang && echo "--with-toolchain-type=clang")
- )
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC MAKE XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- CONFIG_SHELL="${BROOT}/bin/bash"
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- # Too brittle - gets confused by e.g. -Oline
- export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
- unset GNUMAKEFLAGS MAKEFLAGS
-
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
- NICE= # Use PORTAGE_NICENESS, don't adjust further down
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images images)
- )
- emake "${myemakeargs[@]}" -j1
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED}/${dest#/}"
-
- cd "${S}"/build/*-release/images/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- # build system does not remove that
- if use headless-awt ; then
- rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/docs/*
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
- einfo "JavaWebStart functionality provided by icedtea-web package"
-}
diff --git a/dev-java/openjdk/openjdk-8.412_p08.ebuild b/dev-java/openjdk/openjdk-8.422_p05.ebuild
index 6280651782d6..d006b5c56f80 100644
--- a/dev-java/openjdk/openjdk-8.412_p08.ebuild
+++ b/dev-java/openjdk/openjdk-8.422_p05.ebuild
@@ -47,7 +47,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
LICENSE="GPL-2-with-classpath-exception"
SLOT="${PV%%[.+]*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="alsa big-endian debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source"
COMMON_DEPEND="
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 20:09:30 +0000