diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 6b41d38..8dd8d93 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1,18 +1,32 @@ AUX bootcycle_jobs.patch 1273 BLAKE2B 4ff4b9f629167230aa0800da4559b1d31028924971850e9067edb35c506ae4e3eeb0fe8a2d593550c49ff0136641b3c9aebad21bb622eafd41244154474ce5b0 SHA512 6f033c2ab8ef5acb516fcd46dd94ba1021b9f3f3f844595341d2984e67dcbfe442af6918041d1d00922d647e2c31e75820835f9f1eeb163abb0f3ab804e4b864 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 +AUX icedtea8-hotspot-noagent-musl.patch 3334 BLAKE2B 6595d4a2a245aea05f39c3ccbd7267249f0d0e8d0564569adf637e75c9ae7a7dfd4aa871d5bd8e924ec706570368e7e0168c4f592236c1e1f2d12e324944b872 SHA512 1545bcd15d47fb77e07cbed955d5757d96b99c659ca833db701f8711f123ccef6538a2c1fedd87d3c75f1e309ed840c4c74611f6840369c12ef30633adbdb523 +AUX musl/11/aarch64.patch 462 BLAKE2B 6f73eaf1b07417fcd9d980cc3ab7612e1863c2120e7913a5d70dbaf29ce282476ad5e5b59f5796a6ec475c62d44e7c78ed54b21525a5f9974459ed4ec7ce9f9a SHA512 7233c538cfab3eabe01dd4ba3ed59ddc8b60270274230f2e63ddabefd870236289589546cb1a889e03875425702a7c53c8a729c464e8e9b7ce1e8da3458498c2 +AUX musl/11/build.patch 19836 BLAKE2B b5349e5dadd19ca4c844dd549f356f2717305416e829ef93909a125288813cda33a0c6b930396f00b08df0a03ac49224303d8cdc47a4833d2ba4897326bfd9eb SHA512 af9a6b367182880bb31bf4828d8f8fbede384b10a29f9f4aeb6e9e0ff6740745f2027ce52cf548884891ea85c455fe3453ae4e9835af4d52fad94b049ad2f932 +AUX musl/11/fix-bootjdk-check.patch 847 BLAKE2B c843f2258f92fbbf78466f7fa64584b1918452dd4e81073f87f83e376523ae0de98cf18fe657fb2920ad9661e915328c6d101bb4acd02ae12581b69777184c34 SHA512 9b656b0deb8e8012b26339259eadf4237785d4d3b4238a6556ee48a0f1935d831dc8109528b22a5ca8af8df7a25b8c52bc62e899aeffe7e1bd5c120efc70058b +AUX musl/11/ppc64le.patch 8951 BLAKE2B 27ac988f2cd9af6045fd0945296832f9f6ef012e1457a75a20225c03651ca8140322f7467975f49a7e09077657509fa35c19bb7b9b937ef6e654b7d55ebfcc9f SHA512 f6f475e1ad2d431142aee0e7dd3259949b757162235d0ee23a2715f4e612be5853ca6164bff89ed410a91febcbad153e448a1011f1d7e4d838a75ceb2fe801b4 +AUX musl/9/0001_musl_hotspot.patch 5209 BLAKE2B 46d1081a020772280ae6ed3a360563e1f7e2ee145493d3288875c385ed40e1c2909f7884e76f8161cf3ab14766e4dc0442bfd0da9e8b276a30adda2acea31892 SHA512 6d05b00088d7182b91cc8517208de6391b757e4ecfe07492bbdfcccd597d5430d2ff2cf9e5d9c83a376fa475d9094deb2f393d2d15cb54eb6e5667e6bbaf867d +AUX musl/9/0002_musl_hotspot_ppc.patch 1198 BLAKE2B dea0aec583a5afde5897f8d530df578b6a7cfa161d2f2290b785145e05c540522dbe0314a4d0141e289d605ffe5af2541d67204616c53603ea5bfff5b1a35f56 SHA512 a17e0d099452f9d50814fa2229d19b5323571ee4c4f6ce7ee99bd2e024cd90dbc3ec385b02eaf8d9d8871007e91234e2919a781c0ebf1cd8ddc7e73bf130ab46 +AUX musl/9/0003_musl_hotspot_aarch64.patch 581 BLAKE2B 64cceb113d8f3f15df6408a880713bdee297a53834a830fa921dd94d6b8a74e20d247b34d103c2add3f23a97ea08ea6a0f670e99d2a02ae021b656c22ed15f6f SHA512 0dd2295f8637f23ae4d006bda4c9a83e5208c2b1209d076894d3aa81a8f009d0890fd269ed2be6640ca1a84a25753301300427aea5a99fc48a1a15667dbcc35c +AUX musl/9/0004_musl_hotspot_noagent.patch 3541 BLAKE2B a71553a5b3b1739a70146cf9bee821f1e177b4d985ebe0b2ef6e94a5c99c965f5a7ee99484d8fa778c5c37949b3e66754db89c00a1f682bbffbbd6feabff1b0d SHA512 09500457fa654fb95f779d0ebfc64bbdb3cac4776e06518771774456dc3c79ac859558d9af9172de639cc1b3ed2496462310c5b46389fd1ee625a4c93238b56b +AUX musl/9/0005_musl_fix_libjvm_load.patch 556 BLAKE2B ab1b89112723c3dd51567e6fee67f03439d2a0a3c537e2386c1d8f797f08e4bdaae99fb8592e907f535c6d5e5c21a9eb8838e0c1d5718c5e7968bbaac81e544d SHA512 4fe1d43db2371bc5e4f1552ef071529842f2ba8efa1c8cbd5cb3286cad74f46b67858cd4efe3e48d66e8a143488bef5a0f249410b037e9b84ac77d1e618de10b +AUX musl/9/0006_musl_jdk.patch 3750 BLAKE2B 04a01a6ad41d1c84270f5451bc2f0758d02fca6437567509c008cd557a4dcb2dbde91dc7ed3f48b9f56a0fabaf8fd2c206342a9739904049effb4462beb31e1c SHA512 e5bc79a646e531d3e43d28d66cf75691df59819988809675d45f114ee2792aec11fda7972653a0068c432f5e4952ab1f550ef3376088e6e675c7fd3fc1e63378 +AUX musl/9/0007_musl_jdk_includes.patch 6391 BLAKE2B 1e1ddb5a073b1dc5586d1f59dba31f9d4291faa4a4f2cf01ba82b586229178412104e252270c6c37a84f2e7caea02fd37c820b352fface5fbe99344f36373de8 SHA512 1f4b15d17edc784014d24d72a1dfe0b9af63b048a1196852f513d519020262fb83dc3a4d0b88f8de3de0a3424555683417f8fc35150fdf57f43f6a2cf6131f9a +AUX musl/9/0008_musl_jdk_execinfo.patch 733 BLAKE2B f30811d1b32582de336c0ce535462be2c773a5f0c434ea8b02bd5361eeee41eec303e37308e76ca4b0e2e53df5e7e50c7c6b386e113b147e80f7a2807e51f25a SHA512 73b954035444100a87bd3509b0c6fa782324d1af42812bb203d950228cacc8356456da855a825fd5a1cce0aab05def384b0d60382c1ef0b89354a6049143d081 +AUX musl/9/0009_fix_jdk_ipv6_init.patch 1585 BLAKE2B 3536c6875c317e15e855d09b146e101170373fbf34f195fb98168741350a0432940d99a3e87ae48e9803be9996489d8e4128f6b8356bfb5731a9efad385ce20f SHA512 69159f1dd2e56fc9457232cc8734078f87c83d327774b7f0daeb2f880077054f2241787343a6d9f6ad07ca737b50a7165c8ae31f71f94992f6395b867cb83b2d +AUX musl/9/0010_fix_jdk_close_fds.patch 3026 BLAKE2B d417e2d18bbdeed1ba21842cf7b345e4098dce6e3d933bfae8f10d3c925b52c8b8bbd59d9331f9cd1afec8de8b767f309a56ad1f2ff1a6dad6772ab05e92e1df SHA512 547f445208c5fc49e94e29c7d54f2f65a13c23fbd9a76f462deef6c6c1b4fc8930cf76d17a629bf956ee2fd683af7c8fa12bbe9e2a849cca239655a02b9d0e54 AUX openjdk-10.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e -AUX openjdk-12.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e -AUX openjdk-13.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e -AUX openjdk-14.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e -AUX openjdk-15.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e AUX openjdk-9.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e +AUX openjdk9-hotspot-musl.patch 5858 BLAKE2B 5947aa74f25bf0152719e12cfcc5e784a9ce6bee9db5773e9d7f55889ce3de8136206d28d2420c5845d979192afcf1559c8bd59438809b67063a16c1bb024b62 SHA512 3ff2048bf4bbc8da03e56bedcff5e86fb1d9e2546860b893b792d0689da0db72f064a177ec65c9a96f49bd3f88609100c3da56299630e4efa340732dce89655b +AUX openjdk9-hotspot-rlim_t.patch 1661 BLAKE2B 8e18033baf5e2600ffa1a6072391e73ad32f110d16e648d31f6acd09e679fae05a1e495241cfe522c2387bab627e72afcc85ce8c719cbd43491c9ad184e55e66 SHA512 cbca3be62ac17814370f31d8513c5199c738893a6b2e498d3b864986e88380472c34ead92afbd8865f5f9312d5a2bcd1ee0cdede571b51e31745978826d98cb5 +AUX openjdk9-hotspot-stop-using-obsolete-isnanf.patch 1859 BLAKE2B 6fd452271c60a7ade483045487378eca51f2320ac48dd5391780ab92cae396de89f94ff53599038c7a34073d19f36d17b9673f6f9df59360577cdf32bf2bb0fe SHA512 f7c2d49be1b8b5fd8000a9587e2e913067fc3f5be561556e004edd361dbe07ea03b0b1725632cbd5205bd2a7d40ff7a8d6fd6ba3e1be8a9c96fbbed695315470 +AUX openjdk9-jdk-execinfo.patch 703 BLAKE2B 35e24a550b425acf352deecdecaa0ae955b2be67739464836424ffc6e38e87eba6a54cd6185b9ebb8124298789a62c2f76e58fecc15a39e31972e6f20af38c4c SHA512 0aad66dbdb8f6668cb4a6499316e32a0d3d76823446f92b945d74af7075bfb726ad90fffe56c12185ede43a1fc028e2a3d5313d22e273621b3d773447add19ab +AUX openjdk9-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch 2750 BLAKE2B 3e27a45155e79a182e70838da826643a2e410f943bd123e7a341f9f0d8874d067f02781c6f16a613188b096cb7fbab127b31005aec0b6e0ec33980231433ede8 SHA512 5316b0c1886b94ae527ef957a35c577d9051cd3781138214d32c94baa78bb008f6378cba7cc2bace8b249c04ee877418e2d9f22dfc673a2abfb6bb0dbf1535a9 +AUX openjdk9-musl-fix-libjvm-load-on-musl.patch 1383 BLAKE2B 10ec0c12de0f5fc2c4a4dd0ee79aa6f17c309d57c8aa0ef4b2caebe5b99c0e5691aa540a500427d0806de4aa5c3f8f666c56497b86d588e44b1f89d327ed1575 SHA512 319706346f1a349b7c093cad5b4c7c13ff255826bc0b333bb7a63e6b3ad52fc942d85d30375128d4e0c00734f89060eb85171beeef2415a6225d97a3cbc80fc3 +AUX openjdk9-os_linux-remove-glibc-dependencies.patch 1308 BLAKE2B 72c1466783d2196b66cbef8493416928f8428ca2ee0152bd3190508c28c48ac2ddb224d6b87dd33dbec999b8ac94ddc50bdc7261518b35212d48bc0dbc90eb6f SHA512 a55e5a13554d1c06b9900d16541785769a09d22c495d11c8b914fe18e12e33f6a3f7a56189c0277f66243d8986e79233ca7583812509bc947fb2c3932e5a4700 DIST jdk-10.0.2+13.tar.bz2 88365048 BLAKE2B f898a0976cff12cca439ccdba2bf7eff7fcbc5f00709fa41302fd781819a44165fa864d5e551023c507ad18dc957abd24b15744fc6dc5304ee1a26bd4cb8cb86 SHA512 7491da11d5e0013db75d33e09be7a91ac0dbcde6282541a39fe471fd5368d49b15403bc7508b330ca60210b3ca02730743ba280657283a231853f6882a3ca74d DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6 -DIST openjdk-12.0.2_p1.tar.bz2 83912905 BLAKE2B cf81872dc9a68758bd46a0c486893321461323872d204028b84c36fdd8f9de54c88bb70d4f0c50b7370f589a424852e74a383dea71e17c227ac740283dd933e4 SHA512 53c66ae9bdc6aa47b05f57845d696edf55c5e5eeb6c7dd6cd46b9a0cfad9864db846ac88e00aefbc86ff9ffa77ab9bcf9cf3c73b7f3b797ad68d9e8609438dd9 -DIST openjdk-13.0.4_p1.tar.bz2 83507118 BLAKE2B 500985c9b406ec62fdbacf8f1c5350c48dbd029384313a5a95632f860ba20191e1f9be79fe860c3f9a6d8461ed2207be97f03fb8b740cbd7ae1f04242691c05f SHA512 2f2f30e3450ed2f73b56ad722784d8d01b3bddf46c55b1f2bd283920c7eb51c94816048021d68e8d9ab524a1db4979f2926684c6441c49fe092c1778ced346d5 -DIST openjdk-14.0.2_p1.tar.gz 109297285 BLAKE2B be60397242955b3479bfee9cc1b43e2c5ddc404c20e310ece294fa9cbd3b9cb32e198bd4d241c3731efc92cb17e36efbd8b30fa618bd4cbec9ec139283e82518 SHA512 e76b7908e7b1375029564d39386c86b640fcb61c7152bdda7249a6455516792830f17e987c98790ae5983087b928be6f5d572b8b10f3e2318d2d993f5f22ed62 -DIST openjdk-15.0.0_p36.tar.gz 101812870 BLAKE2B 1028ab04825941452b603998f05e2a7e419931979a19855f6ea6c1578c331704ac19ae77043a4f44b2f5d9d481b9a9eaad6c3e3eec9154789d54980ba0295bb7 SHA512 c08d2818de06569278b67954556221ed7c6ab6848ffc57823b789f370ebdd332d2803979a5a254e8f9f669ea161bb479f66ad4e1490b37889d38233b6cca4357 DIST openjdk-9.0.4_p12.tar.bz2 823756 BLAKE2B f1b457655520b983597b15254323abdb0c39feaff78ce36d88ef556a086d9f9333ceddec63d945ca28bb06f4a06c2bc1344051ac2c1df55a01728016ff7255c1 SHA512 cef3655ae7db657e6c81aa86587e451e58896bb6ee786495f6d757096334435b6a4de26ec3ec927da2487e135f09ce26414f8d6b9b9c508a28d3087be286b1ec DIST openjdk-corba-9.0.4_p12.tar.bz2 1002503 BLAKE2B 789664686432cee36e7e165aa4ac6e9a2ed1a1a85a961cd362d9bbdf59d7c7077b71bd2fc59e03f3e3a8cdbc4443a7e359fbfbbbaebfe29bbd220e3cafc3a298 SHA512 455998437a9e3ff538b921025d57e19e6fb5148b3f124c9c427c3604689884d81b3ce5c9dbd93d88de26bf1b43ce76d75f75afd95e473a94973a668575e41748 DIST openjdk-hotspot-9.0.4_p12.tar.bz2 11411231 BLAKE2B a21a5003266f6d8f60adaf78b109d496e46058841d0ab2c8f17256a503124b36e18908240f04fdbb16c056a1f68608f891fed1dbb9c9a0b2bb2326a303a32a4f SHA512 49d93764b13085a5626bec1c3d4e790f8748c24577a4e990e76bd1006721a5b8b9a256c40bf6419df4dda6f6390e457485f90c1b1101c010476a04d9056e9f16 @@ -23,9 +37,5 @@ DIST openjdk-langtools-9.0.4_p12.tar.bz2 4497608 BLAKE2B 382bfa6119345f1983cf5a1 DIST openjdk-nashorn-9.0.4_p12.tar.bz2 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97 EBUILD openjdk-10.0.2_p13.ebuild 7530 BLAKE2B e3d307b1af2c32f19cfe001a0009634aa377429bea882dd51a2a4fb714bc6934d9b700b1d3c2a8db25901f93f02bb8990a5016315b810dce7b1b10c986c424de SHA512 434b71216129c6a42c89b01d37d6b21205549a9caadd0e075771f5e514557d392d7f4b00dbe2a86cdbec6fa17648da952b356d667ac6bd594aa0a07c1ce762c8 EBUILD openjdk-11.0.5_p10.ebuild 7663 BLAKE2B 71e3d5259823f5a1944dda4b2394265799b007fe79057bc5e22a7aba550d8b6c4de52f1f2b0fa7b7d4288fa6d4247537012e1209215a4872361c9557e1d0e8f0 SHA512 f6323118aa9dabb339b48b98e7219043b700471e4652e9d0b4fca1b20baa55d0ffcd989e02bf7ea8b5cfe88865eaf5e863b5dc1729f706bcf7b2e5d67fc16fbd -EBUILD openjdk-12.0.2_p1.ebuild 7781 BLAKE2B 9ac75843354349bc67d28277933a6ea6a5307db8bea5390d9e798414e02a7ffb483011caccd0b7b409ddb98443e0045dda0bb0d57fc192e00884e70326d5f50e SHA512 d99c2bf7cc4997219a043fabbde56e2d7f821933e308085fb666027fbe2548102d55a55f84f639b3ce787782b8d6558ec01695103691de5ebb8ab53bd0718ddc -EBUILD openjdk-13.0.4_p1.ebuild 7781 BLAKE2B 9ac75843354349bc67d28277933a6ea6a5307db8bea5390d9e798414e02a7ffb483011caccd0b7b409ddb98443e0045dda0bb0d57fc192e00884e70326d5f50e SHA512 d99c2bf7cc4997219a043fabbde56e2d7f821933e308085fb666027fbe2548102d55a55f84f639b3ce787782b8d6558ec01695103691de5ebb8ab53bd0718ddc -EBUILD openjdk-14.0.2_p1.ebuild 8298 BLAKE2B 8dc89c9353b7233b06099f8a171efc579a0e0df7d07e1d62f823124158eaccd464e2389dec87eb84b7818a5e13d7b1581e9c204adcd695bec381efba8bc0c738 SHA512 b98ec119c4e7e61a8490544833b1649655b1f03e5694e64ba739396698294da106306cea70241e689144912bccef2d334841c73d3e22d5653d96e043c37304c5 -EBUILD openjdk-15.0.0_p36.ebuild 8298 BLAKE2B 8dc89c9353b7233b06099f8a171efc579a0e0df7d07e1d62f823124158eaccd464e2389dec87eb84b7818a5e13d7b1581e9c204adcd695bec381efba8bc0c738 SHA512 b98ec119c4e7e61a8490544833b1649655b1f03e5694e64ba739396698294da106306cea70241e689144912bccef2d334841c73d3e22d5653d96e043c37304c5 -EBUILD openjdk-9.0.4_p12.ebuild 7431 BLAKE2B 0f3e942d48e787a54429ad6a7f076b4ec20800b918d82d3797810c8db390297f68457590481450649df1d8581a029616a5c98330229892e3e5f12f9dafa87916 SHA512 5ca4c6294546be74e19a85fe827a74d72dabd39049153043c92ef8b8432c42d6845fa202e68a5936eb2bc6ceb2fb86572fb7a74305ad5aa292055d200f571b68 +EBUILD openjdk-9.0.4_p12.ebuild 8043 BLAKE2B 76433abd5b19181bd6a85f708a2d6ac5cd9a34d5721004c6c680c5f952e5e8e997b9d223b3a1158ecc87bbeaaa96d0afe9ad568c2f6e94553d420766b4e2a092 SHA512 54ad4e658d1fde1b3f45525e79b1760311888f98a3c1623b2d3bfb4e60b749512a37103983f3e3e1cb34dbeee98ac473c5caf6fb5150fa57bba835fa73eb5c20 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959 diff --git a/dev-java/openjdk/files/icedtea8-hotspot-noagent-musl.patch b/dev-java/openjdk/files/icedtea8-hotspot-noagent-musl.patch new file mode 100644 index 0000000..6467d05 --- /dev/null +++ b/dev-java/openjdk/files/icedtea8-hotspot-noagent-musl.patch @@ -0,0 +1,84 @@ +diff -Naurw openjdk.orig/common/autoconf/configure openjdk/common/autoconf/configure +--- openjdk.orig/common/autoconf/configure 2016-02-02 13:31:48.655932240 -0800 ++++ openjdk/common/autoconf/configure 2016-02-02 13:36:24.860924385 -0800 +@@ -96,7 +96,7 @@ + } + + # Check for local changes +-check_hg_updates ++run_autogen_or_fail + + if test -e $conf_custom_script_dir/generated-configure.sh; then + # Test if open configure is newer than custom configure, if so, custom needs to +diff -Naurw openjdk.orig/common/autoconf/jdk-options.m4 openjdk/common/autoconf/jdk-options.m4 +--- openjdk.orig/common/autoconf/jdk-options.m4 2016-02-02 13:31:48.657932240 -0800 ++++ openjdk/common/autoconf/jdk-options.m4 2016-02-02 13:36:24.860924385 -0800 +@@ -151,7 +151,7 @@ + AC_SUBST(JVM_VARIANT_ZEROSHARK) + AC_SUBST(JVM_VARIANT_CORE) + +- INCLUDE_SA=true ++ AC_CHECK_HEADER(thread_db.h,INCLUDE_SA=true,INCLUDE_SA=false) + if test "x$JVM_VARIANT_ZERO" = xtrue ; then + INCLUDE_SA=false + fi +diff -Naurw openjdk.orig/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make +--- openjdk.orig/hotspot/make/linux/makefiles/defs.make 2016-02-02 13:31:53.410932105 -0800 ++++ openjdk/hotspot/make/linux/makefiles/defs.make 2016-02-02 13:36:24.861924385 -0800 +@@ -309,6 +309,9 @@ + + # Serviceability Binaries + # No SA Support for PPC, IA64, ARM or zero ++# or if thread_db.h missing (musl) ++ ++ifneq ($(wildcard /usr/include/thread_db.h),) + ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ + $(EXPORT_LIB_DIR)/sa-jdi.jar + ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ +@@ -326,6 +329,11 @@ + endif + endif + endif ++else ++ADD_SA_BINARIES/x86 = ++ADD_SA_BINARIES/sparc = ++ADD_SA_BINARIES/aarch64 = ++endif + ADD_SA_BINARIES/ppc = + ADD_SA_BINARIES/ia64 = + ADD_SA_BINARIES/arm = +diff -Naurw openjdk.orig/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make +--- openjdk.orig/hotspot/make/linux/makefiles/sa.make 2016-02-02 13:31:53.414932105 -0800 ++++ openjdk/hotspot/make/linux/makefiles/sa.make 2016-02-02 13:36:24.861924385 -0800 +@@ -59,9 +59,11 @@ + + # if $(AGENT_DIR) does not exist, we don't build SA + # also, we don't build SA on Itanium or zero. ++# check for thread_db.h too (musl does not have it). + + all: +- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \ ++ if [ -d $(AGENT_DIR) -a -f /usr/include/thread_db.h \ ++ -a "$(SRCARCH)" != "ia64" \ + -a "$(SRCARCH)" != "zero" ] ; then \ + $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ + fi +diff -Naurw openjdk.orig/hotspot/make/linux/makefiles/saproc.make openjdk/hotspot/make/linux/makefiles/saproc.make +--- openjdk.orig/hotspot/make/linux/makefiles/saproc.make 2016-02-02 13:31:53.745932095 -0800 ++++ openjdk/hotspot/make/linux/makefiles/saproc.make 2016-02-02 13:36:24.861924385 -0800 +@@ -61,12 +61,15 @@ + + # if $(AGENT_DIR) does not exist, we don't build SA + # also, we don't build SA on Itanium or zero. ++# check for thread_db.h too (musl does not have it). + ++ifneq ($(wildcard /usr/include/thread_db.h),) + ifneq ($(wildcard $(AGENT_DIR)),) + ifneq ($(filter-out ia64 zero,$(SRCARCH)),) + BUILDLIBSAPROC = $(LIBSAPROC) + endif + endif ++endif + + ifneq ($(ALT_SASRCDIR),) + ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR diff --git a/dev-java/openjdk/files/openjdk9-hotspot-musl.patch b/dev-java/openjdk/files/openjdk9-hotspot-musl.patch new file mode 100644 index 0000000..953736d --- /dev/null +++ b/dev-java/openjdk/files/openjdk9-hotspot-musl.patch @@ -0,0 +1,183 @@ +--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp ++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +@@ -73,7 +73,6 @@ + # include + # include + # include +-# include + + #ifdef AMD64 + #define REG_SP REG_RSP +@@ -532,6 +531,9 @@ + + ShouldNotReachHere(); + } ++ ++#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw)) ++#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw)) + + void os::Linux::init_thread_fpu_state(void) { + #ifndef AMD64 +--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp ++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +@@ -75,7 +75,7 @@ + # include + # include + # include +-# include ++# include /* provides __u64 */ + + #ifdef BUILTIN_SIM + #define REG_SP REG_RSP +--- openjdk.orig/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h 2018-01-22 15:19:02.000000000 +0000 ++++ openjdk/hostspot/src/jdk.hotspot.agent/linux/native/libsaproc/proc_service.h 2020-10-12 12:56:27.323706510 +0000 +@@ -26,7 +26,7 @@ + #define _PROC_SERVICE_H_ + + #include +-#include ++#include + + // Linux does not have the proc service library, though it does provide the + // thread_db library which can be used to manipulate threads without having +@@ -43,34 +43,4 @@ + PS_NOFREGS /* FPU register set not available for given lwp */ + } ps_err_e; + +-// ps_getpid() is only defined on Linux to return a thread's process ID +-pid_t ps_getpid(struct ps_prochandle *ph); +- +-// ps_pglobal_lookup() looks up the symbol sym_name in the symbol table +-// of the load object object_name in the target process identified by ph. +-// It returns the symbol's value as an address in the target process in +-// *sym_addr. +- +-ps_err_e ps_pglobal_lookup(struct ps_prochandle *ph, const char *object_name, +- const char *sym_name, psaddr_t *sym_addr); +- +-// read "size" bytes of data from debuggee at address "addr" +-ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t addr, +- void *buf, size_t size); +- +-// write "size" bytes of data to debuggee at address "addr" +-ps_err_e ps_pdwrite(struct ps_prochandle *ph, psaddr_t addr, +- const void *buf, size_t size); +- +-ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lid, const prfpregset_t *fpregs); +- +-ps_err_e ps_lsetregs(struct ps_prochandle *ph, lwpid_t lid, const prgregset_t gregset); +- +-ps_err_e ps_lgetfpregs(struct ps_prochandle *ph, lwpid_t lid, prfpregset_t *fpregs); +- +-ps_err_e ps_lgetregs(struct ps_prochandle *ph, lwpid_t lid, prgregset_t gregset); +- +-// new libthread_db of NPTL seem to require this symbol +-ps_err_e ps_get_thread_area(); +- + #endif /* _PROC_SERVICE_H_ */ + +--- openjdk.orig/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c 2018-01-22 15:19:02.000000000 +0000 ++++ openjdk/hotspot/src/jdk.hotspot.agent/linux/native/libsaproc/libproc_impl.c 2020-10-12 13:00:33.143035725 +0000 +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include "libproc_impl.h" + + #define SA_ALTROOT "SA_ALTROOT" +@@ -116,11 +116,13 @@ + // init debug mode + _libsaproc_debug = debug; + ++#ifdef INCLUDE_SA_ATTACH + // initialize the thread_db library + if (td_init() != TD_OK) { + print_debug("libthread_db's td_init failed\n"); + return false; + } ++#endif + + return true; + } +@@ -273,6 +275,7 @@ + } + + ++#ifdef INCLUDE_SA_ATTACH + // struct used for client data from thread_db callback + struct thread_db_client_data { + struct ps_prochandle* ph; +@@ -299,9 +302,11 @@ + + return TD_OK; + } ++#endif + + // read thread_info using libthread_db + bool read_thread_info(struct ps_prochandle* ph, thread_info_callback cb) { ++#ifdef INCLUDE_SA_ATTACH + struct thread_db_client_data mydata; + td_thragent_t* thread_agent = NULL; + if (td_ta_new(ph, &thread_agent) != TD_OK) { +@@ -322,6 +327,30 @@ + + // delete thread agent + td_ta_delete(thread_agent); ++#else ++ DIR *dir = NULL; ++ struct dirent *ent = NULL; ++ char taskpath[80]; ++ pid_t pid = ph->pid; ++ ++ // Find the lwpids to attach to by traversing the /proc//task/ directory. ++ snprintf(taskpath, sizeof (taskpath), "/proc/%ld/task", (unsigned long)pid); ++ if ((dir = opendir(taskpath)) != NULL) { ++ while ((ent = readdir(dir)) != NULL) { ++ unsigned long lwp; ++ ++ if ((lwp = strtoul(ent->d_name, NULL, 10)) != 0) { ++ // Create and add the thread info. ++ (*cb)(ph, 0, lwp); ++ } ++ } ++ } else { ++ print_debug("Could not open /proc/%ld/task.\n", (unsigned long)pid); ++ return false; ++ } ++ ++ closedir(dir); ++#endif + return true; + } + +diff -U3 -r openjdk-9.0.4_p12/work/hotspot-jdk-9.0.4+12/make/lib/Lib-jdk.hotspot.agent.gmk openjdk-9.0.4_p12.orig/work/hotspot-jdk-9.0.4+12/make/lib/Lib-jdk.hotspot.agent.gmk +--- openjdk.orig/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk 2018-01-22 15:19:02.000000000 +0000 ++++ openjdk/hotspot/make/lib/Lib-jdk.hotspot.agent.gmk 2020-10-12 13:03:00.569605599 +0000 +@@ -57,7 +57,10 @@ + SA_CFLAGS := $(CFLAGS_JDKLIB) -D_FILE_OFFSET_BITS=64 \ + $(SA_MACHINE_FLAG_linux) + SA_LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_MACHINE_FLAG_linux) +- SA_LIBS := -lthread_db $(LIBDL) ++ SA_LIBS := $(LIBDL) ++ ifeq ($(INCLUDE_SA_ATTACH), true) ++ SA_LIBS += -lthread_db ++ endif + + else ifeq ($(OPENJDK_TARGET_OS), solaris) + SA_TOOLCHAIN := TOOLCHAIN_LINK_CXX +@@ -95,6 +98,13 @@ + endif + endif + ++ifeq ($(INCLUDE_SA_ATTACH), true) ++ SA_CFLAGS += -DINCLUDE_SA_ATTACH ++endif ++ ++SA_CFLAGS += -DLIBC=\"$(OPENJDK_TARGET_LIBC)\" ++ ++ + ################################################################################ + + $(eval $(call SetupNativeCompilation, BUILD_LIBSA, \ diff --git a/dev-java/openjdk/files/openjdk9-hotspot-rlim_t.patch b/dev-java/openjdk/files/openjdk9-hotspot-rlim_t.patch new file mode 100644 index 0000000..818971d --- /dev/null +++ b/dev-java/openjdk/files/openjdk9-hotspot-rlim_t.patch @@ -0,0 +1,48 @@ + +# HG changeset patch +# User mikael +# Date 1491957311 25200 +# Node ID 38d9b9a9c4762b42a5c16928470c73c0f632d71c +# Parent 8ca8c24ffc52e453ed58a198b479a85c911d6da0 +Make printing of rlim_t values more portable + +diff -r 8ca8c24ffc52 -r 38d9b9a9c476 src/os/posix/vm/os_posix.cpp +--- a/src/os/posix/vm/os_posix.cpp Tue Apr 11 16:59:40 2017 -0700 ++++ b/src/os/posix/vm/os_posix.cpp Tue Apr 11 17:35:11 2017 -0700 +@@ -207,30 +207,30 @@ + st->print(" STACK "); + getrlimit(RLIMIT_STACK, &rlim); + if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); +- else st->print("%luk", rlim.rlim_cur >> 10); ++ else st->print(UINT64_FORMAT "k", u8(rlim.rlim_cur) >> 10); + + st->print(", CORE "); + getrlimit(RLIMIT_CORE, &rlim); + if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); +- else st->print("%luk", rlim.rlim_cur >> 10); ++ else st->print(UINT64_FORMAT "k", u8(rlim.rlim_cur) >> 10); + + // Isn't there on solaris + #if !defined(SOLARIS) && !defined(AIX) + st->print(", NPROC "); + getrlimit(RLIMIT_NPROC, &rlim); + if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); +- else st->print("%lu", rlim.rlim_cur); ++ else st->print(UINT64_FORMAT, u8(rlim.rlim_cur)); + #endif + + st->print(", NOFILE "); + getrlimit(RLIMIT_NOFILE, &rlim); + if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); +- else st->print("%lu", rlim.rlim_cur); ++ else st->print(UINT64_FORMAT, u8(rlim.rlim_cur)); + + st->print(", AS "); + getrlimit(RLIMIT_AS, &rlim); + if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); +- else st->print("%luk", rlim.rlim_cur >> 10); ++ else st->print(UINT64_FORMAT "k", u8(rlim.rlim_cur) >> 10); + st->cr(); + } + + diff --git a/dev-java/openjdk/files/openjdk9-hotspot-stop-using-obsolete-isnanf.patch b/dev-java/openjdk/files/openjdk9-hotspot-stop-using-obsolete-isnanf.patch new file mode 100644 index 0000000..e165170 --- /dev/null +++ b/dev-java/openjdk/files/openjdk9-hotspot-stop-using-obsolete-isnanf.patch @@ -0,0 +1,42 @@ +From 1624e2dd3739fe208efa13b31abf4bc53ae2e5c1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= > +Date: Tue, 27 Feb 2018 11:24:44 +0000 +Subject: [PATCH 1/9] hotspot: stop using obsolete isnanf() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Compiling against musl-libc gives the following error: +| hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp: In function 'int g_isnan(float)': +| hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp:238:39: error: 'isnanf' was not declared in this scope +| inline int g_isnan(float f) { return isnanf(f); } +| ^~~~~~ + +isnanf() is obsolete, and musl doesn't implement it. isnan() +is the right thing to use for all types (float and double), +replacing isnanf(), even on glibc. + +Do so. + +Upstream-Status: Pending +Signed-off-by: André Draszik > +--- + hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp +index efa0b4e1..6df2302e 100644 +--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ++++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp +@@ -235,7 +235,7 @@ inline int g_isnan(double f) { return isnand(f); } + #elif defined(__APPLE__) + inline int g_isnan(double f) { return isnan(f); } + #elif defined(LINUX) || defined(_ALLBSD_SOURCE) +-inline int g_isnan(float f) { return isnanf(f); } ++inline int g_isnan(float f) { return isnan(f); } + inline int g_isnan(double f) { return isnan(f); } + #else + #error "missing platform-specific definition here" +-- +2.16.2 + diff --git a/dev-java/openjdk/files/openjdk9-jdk-execinfo.patch b/dev-java/openjdk/files/openjdk9-jdk-execinfo.patch new file mode 100644 index 0000000..220bb2d --- /dev/null +++ b/dev-java/openjdk/files/openjdk9-jdk-execinfo.patch @@ -0,0 +1,21 @@ +diff -Naurw openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c +--- a/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c 2015-03-23 10:05:01.000000000 +0700 ++++ b/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c 2015-08-26 15:55:39.775658680 +0700 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#ifdef __linux__ ++#if defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__) + #include + #endif + +@@ -799,7 +799,7 @@ + return ret; + } + +-#ifdef __linux__ ++#if defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__) + void print_stack(void) + { + void *array[10]; diff --git a/dev-java/openjdk/files/openjdk9-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch b/dev-java/openjdk/files/openjdk9-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch new file mode 100644 index 0000000..9d44e9c --- /dev/null +++ b/dev-java/openjdk/files/openjdk9-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch @@ -0,0 +1,69 @@ +From ec37e9e5663611e49c7c976d34450ea6b90d0f24 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= > +Date: Fri, 2 Mar 2018 13:37:20 +0000 +Subject: [PATCH 8/9] jdk: musl build fix (use SIGRTMAX rather than __SIGRTMAX) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +__SIGRTMAX is a private glibc symbol, which isn't provided +by musl, thus failing compilation. + +From https://sourceware.org/ml/rda/2005-q4/msg00011.html + On a GNU(ish) system, [SIGRTMIN / SIGRTMAX] these macros are defined + to call functions which compute the actual minimum and maximum + realtime signal numbers. In particular, this computation will exclude + any signals used by the C library for its own purposes. These signals + could include signals related to thread debugging or, more + importantly, for thread cancellation. +[...] + [The __SIGRTMIN and __SIGRTMAX] constants represent a hard minumum + and maximum. + +Patch taken from Alpine Linux: + https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-musl.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: André Draszik > +--- + jdk/src/solaris/native/java/net/linux_close.c | 3 ++- + jdk/src/solaris/native/sun/nio/ch/NativeThread.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/jdk/src/solaris/native/java/net/linux_close.c b/jdk/src/solaris/native/java/net/linux_close.c +index 85fba135..e635dafd 100644 +--- a/jdk/src/java.base/linux/native/libnet/linux_close.c ++++ b/jdk/src/java.base/linux/native/libnet/linux_close.c +@@ -56,7 +56,7 @@ typedef struct { + /* + * Signal to unblock thread + */ +-static int sigWakeup = (__SIGRTMAX - 2); ++static int sigWakeup; + + /* + * The fd table and the number of file descriptors +@@ -95,6 +95,7 @@ static void __attribute((constructor)) init() { + /* + * Setup the signal handler + */ ++ sigWakeup = SIGRTMAX - 2; + sa.sa_handler = sig_wakeup; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); +diff --git a/jdk/src/solaris/native/sun/nio/ch/NativeThread.c b/jdk/src/solaris/native/sun/nio/ch/NativeThread.c +index 204f0441..f5483bbd 100644 +--- a/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c ++++ b/jdk/src/java.base/unix/native/libnio/ch/NativeThread.c +@@ -36,7 +36,7 @@ + #include + #include + /* Also defined in net/linux_close.c */ +- #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) ++ #define INTERRUPT_SIGNAL (SIGRTMAX - 2) + #elif _AIX + #include + #include +-- +2.16.2 + diff --git a/dev-java/openjdk/files/openjdk9-musl-fix-libjvm-load-on-musl.patch b/dev-java/openjdk/files/openjdk9-musl-fix-libjvm-load-on-musl.patch new file mode 100644 index 0000000..ce54230 --- /dev/null +++ b/dev-java/openjdk/files/openjdk9-musl-fix-libjvm-load-on-musl.patch @@ -0,0 +1,37 @@ +From 4429d73853b3938a53a6058cc0dcaac08d191995 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Tue, 27 Feb 2018 16:01:54 +0000 +Subject: [PATCH 3/9] jdk: fix libjvm load on musl (set LD_LIBRARY_PATH) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +musl needs LD_LIBRARY_PATH set because when .so is opened +with dlopen(/abs/path) it does not qualify for providing +symbols for NEEDED dependency. + +Patch taken from Alpine Linux: + https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/icedtea-jdk-fix-libjvm-load.patch?id=4d34f29dddd3934358df7a9607706d09ae0433c3 + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: André Draszik +--- + jdk/src/solaris/bin/java_md_solinux.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/jdk/src/solaris/bin/java_md_solinux.c b/jdk/src/solaris/bin/java_md_solinux.c +index 6d977109..e9a0a1eb 100644 +--- a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c ++++ b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c +@@ -291,6 +291,8 @@ RequiresSetenv(int wanted, const char *jvmpath) { + char *dmllp = NULL; + char *p; /* a utility pointer */ + ++ return JNI_TRUE; ++ + #ifdef AIX + /* We always have to set the LIBPATH on AIX because ld doesn't support $ORIGIN. */ + return JNI_TRUE; +-- +2.16.2 + diff --git a/dev-java/openjdk/files/openjdk9-os_linux-remove-glibc-dependencies.patch b/dev-java/openjdk/files/openjdk9-os_linux-remove-glibc-dependencies.patch new file mode 100644 index 0000000..705b806 --- /dev/null +++ b/dev-java/openjdk/files/openjdk9-os_linux-remove-glibc-dependencies.patch @@ -0,0 +1,40 @@ +--- a/src/os/linux/vm/os_linux.orig 2020-07-19 13:28:52.744716037 +0000 ++++ b/src/os/linux/vm/os_linux.cpp 2020-07-19 13:31:44.582341353 +0000 +@@ -98,7 +98,6 @@ + # include + # include + # include +-# include + # include + # include + # include +@@ -496,6 +495,11 @@ + // detecting pthread library + + void os::Linux::libpthread_init() { ++#if 1 ++ // Hard code supported musl compatible settings (taken from alpine linux) ++ os::Linux::set_glibc_version("glibc 2.9"); ++ os::Linux::set_libpthread_version("NPTL"); ++#else + // Save glibc and pthread version strings. + #if !defined(_CS_GNU_LIBC_VERSION) || \ + !defined(_CS_GNU_LIBPTHREAD_VERSION) +@@ -513,6 +519,7 @@ + str = (char *)malloc(n, mtInternal); + confstr(_CS_GNU_LIBPTHREAD_VERSION, str, n); + os::Linux::set_libpthread_version(str); ++#endif + } + + ///////////////////////////////////////////////////////////////////////////// +@@ -2799,6 +2806,9 @@ + return (retval == -1) ? retval : cpu; + } + ++// musl doesn't have dlvsym() ++#define dlvsym(h,s,v) dlsym(h,s) ++ + // Something to do with the numa-aware allocator needs these symbols + extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { } + extern "C" JNIEXPORT void numa_error(char *where) { } diff --git a/dev-java/openjdk/openjdk-9.0.4_p12.ebuild b/dev-java/openjdk/openjdk-9.0.4_p12.ebuild index a482e63..a4c4f65 100644 --- a/dev-java/openjdk/openjdk-9.0.4_p12.ebuild +++ b/dev-java/openjdk/openjdk-9.0.4_p12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -141,11 +141,25 @@ src_prepare() { chmod +x configure || die local repo for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do - ln -s ../"${repo}-jdk-${MY_PV}" "${repo}" || die + ln -s "../${repo}-jdk-${MY_PV}" "${repo}" || die done # https://bugs.openjdk.java.net/browse/JDK-8201788 - epatch "${FILESDIR}/bootcycle_jobs.patch" + eapply "${FILESDIR}/bootcycle_jobs.patch" + + # conditionally apply patches for musl compatibility + if use elibc_musl; then + cd "../hotspot-jdk-${MY_PV}" + eapply -p2 "${FILESDIR}/${PN}${SLOT}-hotspot-stop-using-obsolete-isnanf.patch" + eapply -p2 "${FILESDIR}/${PN}${SLOT}-hotspot-musl.patch" + eapply "${FILESDIR}/${PN}${SLOT}-hotspot-rlim_t.patch" + eapply "${FILESDIR}/${PN}${SLOT}-os_linux-remove-glibc-dependencies.patch" + + cd "../jdk-jdk-${MY_PV}" + eapply -p2 "${FILESDIR}/${PN}${SLOT}-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch" + eapply -p1 "${FILESDIR}/${PN}${SLOT}-jdk-execinfo.patch" + eapply -p2 "${FILESDIR}/${PN}${SLOT}-musl-fix-libjvm-load-on-musl.patch" + fi } src_configure() { @@ -207,12 +221,12 @@ src_install() { cd "${S}"/build/*-release/images/jdk || die if ! use alsa; then - rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die + rm -v jre/lib/libjsoundalsa.* || die fi # stupid build system does not remove that if use headless-awt ; then - rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ + rm -fvr jre/lib/lib*{[jx]awt,splashscreen}* \ {,jre/}bin/policytool bin/appletviewer || die fi