diff options
Diffstat (limited to 'dev-java/icedtea')
| -rw-r--r-- | dev-java/icedtea/Manifest | 37 | ||||
| -rw-r--r-- | dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch | 16 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-3.17.0.ebuild | 379 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-3.18.0.ebuild (renamed from dev-java/icedtea/icedtea-3.17.1.ebuild) | 53 |
4 files changed, 59 insertions, 426 deletions
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 5f4428c34f51..9fdd2e2050f6 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,28 +1,17 @@ AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a -DIST icedtea-3.17-aarch32-3.17.0.tar.xz 7054840 BLAKE2B 461939116607f82b5aef6dd093204dcf383e209630945f6f0ff0360bbe306e7afc2b1ae339911954c2b80446d37e0d25a587912cbfbebe0ace2e701c2e9e9f67 SHA512 493d9a98166255a630306bf1e67e681e0b2ece42b6e7a96c75b2cfb6cb0639b8c9ed8918eb129c9543fab1805a4ac33774f25ecb2272703eabd6eeb680327717 -DIST icedtea-3.17-aarch32-3.17.1.tar.xz 7054944 BLAKE2B 3bbd364f8af7d4aba6f268058ab5e59ad78a8d696a7cf01df9d8b5e49b8a2e4265c93913fe6e696b4017a8d763cf81d45cc511e1fbe41a0e425f78435fbb9bca SHA512 81e149c3afa8678f2e31b2af6c127e49e131ce7f99873dca012bdd83d1cc64fcd9ca6b4d4cd9dded10e8e6e82648a562ee448822bf3aa161aff2e17e11e644cb -DIST icedtea-3.17-corba-3.17.0.tar.xz 948464 BLAKE2B 97050f07a9ee39c763cff67dcb19ad772fa2529103647b0ec7cdfd40f926cea67e6e02d3f10e7d5aefd8221476c923630f4b9fd6d5f95ae4c74b46e44c911520 SHA512 cec56b02b47f96ac97d6485fc18ea30100ba64c0acd509d408ddfe43e36e14ebf2345b3fefcf001af378af9ed3628ca8c45add604bd435806eba47c9f2945993 -DIST icedtea-3.17-corba-3.17.1.tar.xz 948536 BLAKE2B fce8f3e2ee45326c8eed67b511c74d5d63f38ab5c85b120ce8230b1b1a98a6e6e467e4ee3e935f05bba347ecbaf990494a295b0d2b7e1de7c53d6cbbe39febc8 SHA512 c33886bfa517087e3cf37064fd9dcf1c0b8a9c9ccc4147beac3eb9c07e66c2f8aa3053feb8ab6cbdd42054b073854ed5aaf4a2cfb2888e0a09b7efe3809447c8 -DIST icedtea-3.17-hotspot-3.17.0.tar.xz 7107508 BLAKE2B 61148d11c2cea5fa18e9d115be7dfefa68825cb5396465c2b1c991402ba1a000f2e780773a83a95741571a38992839206e21f26954773fa2306e1a6d4d7eaad9 SHA512 cb1bdf3ab9aee48e745108d2762992c2a6be21e22bf6633a512f4bff28becb61e4cdd3662e7301aa7067271c6c80a8ac2a65fdb5b432b8c02d38b6fd74c7f9e8 -DIST icedtea-3.17-hotspot-3.17.1.tar.xz 7109408 BLAKE2B 902cc0f66c655e9b1754b89430ea092aa04c01fb74f8341a5d66e9f1d7026b23b61e13f5574dafdcfb292a60921b7d1276d36dc5c6110819343aa3a9a9d446db SHA512 e377a2ad481727a1d5218f1bf629690ea5f1b7976307f593505efc07252cc5cd408f7eb0873032ec74ed44a31e5f2cd90747be3e6f709eba5ac9fd90857887ab -DIST icedtea-3.17-jaxp-3.17.0.tar.xz 2268024 BLAKE2B c1fe1e2a6f28d7108dcbdead86e5ef0836877ebb89ba0446045aad3797616e5a16125d6d6dba425b244710bba77ce8a5ac4c6780dd0ab2b9b35f51d551f291b3 SHA512 a7d69f94cb7ce63522dbe1d16376ff0f39e5e5f013f3a895070dcb05d524f63ecbb1ab3d109edbd48e3bfc6e5758200c95b7ec18ceb84cc580a93395760b975a -DIST icedtea-3.17-jaxp-3.17.1.tar.xz 2267932 BLAKE2B a38d42d37902deb367ec804771feff7590b4448f11aac012c84880dd8ea8d7acafe204fb8756d2475148e59509b09003ed0edd167ca3798bc67a02f29570d28f SHA512 e690a6c498e2418feaa22713517aefd051524aedd349fbab5c70fbdee3ca0f17a297089e02f1de2a27e318413e5ca6fe7dfd825b49c37e749ff48e9c8981307a -DIST icedtea-3.17-jaxws-3.17.0.tar.xz 2277156 BLAKE2B 0ea611d90eac928c974d80ae366a95ba7d13b958b7b5e31766ede059015478c3bd87bce4cee2f4350e7dbc8ab27ac2a6e7190efdb61b4e595e8741ab28fa8b1f SHA512 65821e62a2f25e77f3345894d1982e2b6d877ee6ddd2b1dba77b94f1175f7d88fd77ca2d2727f625765702846711f85821f87f62fb6359d2502f57436a22290c -DIST icedtea-3.17-jaxws-3.17.1.tar.xz 2277028 BLAKE2B 0c78fdd7ad320657cc084db03d2f4917a4cc328bc0d64877ed23cbfe89bbcd445716a3677d769da1cc177da956fcb5d34100528bd837ea4704fc4267b9b0a996 SHA512 99c32483c6f5469c256026be9ee5c2a5654768ceff9d10fa9aa10888640af60d618668ae47880062d1253668e546949fd6ffe94c27d6436088e0a8367e2602fd -DIST icedtea-3.17-jdk-3.17.0.tar.xz 40601488 BLAKE2B 18c0629aba53b763680fb2e0dd4ad500db286e584d6aaaf43339559907636f8cd4cae9445131164be810ac2518445c8025d4e361e4c6f31d5436bbea1cb254e3 SHA512 42d5387b228ea3143eb91e4fe661a1d578b879b884f098045b8248c77d1f4a583921c520cfab078847b74615732f2e9318bd532b00ce266dad2364f5a640251d -DIST icedtea-3.17-jdk-3.17.1.tar.xz 40596084 BLAKE2B 9a6f636e4630156bf28c65ade834bc027abf094615df117d5e1579427b3c609b9445fcc947f485e0b600c899da0b7bcc8b63c45aaa870c8172babaddb63e663e SHA512 7f5321944cc6c7510db5d6ea6ef189bd15fdf7c904c8ec009576c33ce1e0288e18e51a5dc906e5c7c3beb4daebb161be0c08d1fe8f2ebde81b72a992da919142 -DIST icedtea-3.17-langtools-3.17.0.tar.xz 2079284 BLAKE2B 0e1d435a54167cf9b3cd381cf12d156ce59da99dd3f02d72422329ee70d7f00dbb25713c315b36a4569408a7ab376de21f0ae525bf7cb3ef54c5fa51ebe50eb1 SHA512 7cd63565adb0beb0a7bf6efc35dacc9bcc8cc48e0e6462c4f295783a48de999fe877964509b81375603fbae18c231084c82cf22c1ee3bb4309360ec2685cebe0 -DIST icedtea-3.17-langtools-3.17.1.tar.xz 2080096 BLAKE2B 0a14904a867ccaf016937d1ad806dca11989a0119e5539cc86480ec01e955d91107d21d58748fb667ff8b68af497c87eb7bcfc8fd8f7c3685136ae88218a059d SHA512 68ff7857d180b90a77858505523416bee6102e30af7a394d08ab1581ba65d28b78c30f48c1b5555c30bf8b43adc5497d5530372101dc2e4adbc99e5d9c988def -DIST icedtea-3.17-nashorn-3.17.0.tar.xz 2320268 BLAKE2B d77ea15aa6d1b268fcd06a3222f7f526cb46887e0454a612ddf7fd57465c166ebe1ce16436c90ada71a097292be334e25622b223fb40708976f3d3cd7514e23a SHA512 50c5a4e4faa377e8b61395062a7b86856553e48a66d32d83730a536bb8c09f768a78dfc604e679c8fa5c9297887d6432012b2db2f7810b00aaebee3c775960b3 -DIST icedtea-3.17-nashorn-3.17.1.tar.xz 2319500 BLAKE2B 5748eed107f62f17624c0db99b6ca76bdff4c4deba57f579f50dad36b5e1d055b1a80099be6503ee5897203a20d356050e1974883b46cb1cf892e0100474094d SHA512 088948d01fc6ea627610bbdcf6691a7bcdd34c5715be103297292db54d0e9080f82f395c3b4bb432058615bc04e05c2d4292fc8f31735e3005d4cf16ff1f9af1 -DIST icedtea-3.17-openjdk-3.17.0.tar.xz 364764 BLAKE2B c0bb286b691c50ca9d0e6982dab73929065a3af13f1974bd661a51e4959eec38a045fa7032854a65a17cc3f8a826f881c46eda062225af551da7c22f9591ee4f SHA512 4b074a6b14efcb23476a1fed56d52e8f2defea16f840a714324cfd0c3302e3a742123e86f8964a5708600f0856ae1c4daacd0513eaed35d299512277eed7eca8 -DIST icedtea-3.17-openjdk-3.17.1.tar.xz 364724 BLAKE2B 2e608d47d746cd8702e41b54fbe8984c6887dea3a40b4f28db11fb73b7078d13a41db0ceac73ad70359c89e4d03c1e64a8a41c2e0a7b4747b832d7398d8a89af SHA512 82f2688b018b893cbf583ccc1cd328f6909ebeb4d30655ddb554691f1f0ee38debe57dc91bc8200d6676ad531047ffbf149ce7c1e49b65e67db3254c7d6205ed -DIST icedtea-3.17-shenandoah-3.17.0.tar.xz 7277048 BLAKE2B 034d27ce07b48d27302180da2b100cdf97adc7109a56e9cb67ee37f93957f009f65a460b706ff563c0022efdfd1749322caee069916df4e090aee217ca60b1cd SHA512 ce7df9784a48028ea69f6a2b0f5b08a13456e71ce3e8773b14e5a7c801b0917dd7f5609e2dcdf574836ec2d69bc0acec0648ee087283052c200822b3786e155d -DIST icedtea-3.17-shenandoah-3.17.1.tar.xz 7276688 BLAKE2B 02db748f1b87694fe0995b153211ccfeb8719a0b8e5f32396eff15012e396647294eb809b6561f1ed845cfd0f43a8b297f55f444651020ea42f1a05c2f0d4692 SHA512 a1bdda704f0331ad445143a7bd9fba33090c2cfd1a6d73a6c427378e3685ca40e0d600256c3c678820061e93d5bdc3faf9040bb11e62647d7b3f9218406405a7 -DIST icedtea-3.17.0.tar.xz 1565156 BLAKE2B f2b5f0b0ac1de70ddd5faa1215fcb17b5b7bee726ca5dd81bc2e3948c7fd342dfe1d7c9dbd232696bf0f2d68f214b0132f386d182b1fe15ec72cdb77cc0ba67c SHA512 4183037d6829f7fdd25b970853e84bfeecb45adca7fb78e773c431e401c155c212b78bc6daf80d8479c13e9ca63ad5446122a8ec2d6e6b1bede8ee747ba7a91b -DIST icedtea-3.17.1.tar.xz 1565996 BLAKE2B 36a92826fd7f1cda9b1b90d93b57c4fe63cdcbd3e5d6320f3b6ac9819720156943232b17c9b3a6a5ca796cb2a29ef47426e9f10491af844bfa12a99252312d69 SHA512 eaf66df177f08cf335fe795f816e4f6b70a25a402ff8db4c1a2c545dd129350e1135c45e131eab8820620de2a75fda1d56141583ec1a651218d0a02680eb1df7 +AUX openjdk-8-hotspot-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de +DIST icedtea-3.18-aarch32-3.18.0.tar.xz 7057736 BLAKE2B bd681871da038ee1eaabe5c38e830a9d80fff30f8793b81afb69803107d0ee2ae8f3dad3985ec05c86120f1e3c86101984397476a76bce30a7b1852784175521 SHA512 3bc033bb4256d6a8ee8387998fbb4b1a14d2c6882337366085ca4648eb9b2a34176003e23e420703a075fb5322a1be3547d5ed82188d97e1f12429b4a8b3671d +DIST icedtea-3.18-corba-3.18.0.tar.xz 948504 BLAKE2B 00deb77d5aebf19ad404bf44ac7367017f8aee6699e11b93d2cb44f7d23f17f13caba8aee9862b25e528bee3d8fbfa728260850d1aa2f66839b079b1111d3af4 SHA512 db71a9fd6288a8217a8338dda70a87eb4b97f1659c7e990eccd2774785bf1da9e35b71e231e108c610784922d1fa01cdaf115941189910ef9c68cf70746296ea +DIST icedtea-3.18-hotspot-3.18.0.tar.xz 7110964 BLAKE2B ac45a7271f50a93b0ee27e6096820f3f93a02db42c6fde549515c3297590c94fff349a6cec5c9caf7bda31bbe36d6609097b4f73e99cdc1fe46bcfff0330a82e SHA512 abc46441c6ea7f652ee42376425e2fdd34a18de0803a13f38aa002a57a2835f8e2995f9a762fb53f114ad7b1030fc9ab82bd00839fccf57315018519df1c5c5f +DIST icedtea-3.18-jaxp-3.18.0.tar.xz 2268136 BLAKE2B 6f398420e55684792020da116f8da25e1b4a59b2423d6b37ed55a567ba68aedca7a59c99ee0e3a87785a12910b518d07a9d0d248bb3ae151f81c7622ec904299 SHA512 fe8d25e38d05e0f65f91712ee7e4b6469605c9a6bd9b0cbdd29f483889b267483008fb913191ffa277047a66ad43eb397582935d984fad00e469b118532a1adf +DIST icedtea-3.18-jaxws-3.18.0.tar.xz 2277356 BLAKE2B f0c3123722df57346461940f41e6b394a34c9e508ab3d2fa9f75581d4d626468394e2854129671e9bd68ecd217ed3aa0933cd14e2e74acd82d1cccd897e2b209 SHA512 b6879bdab06d1706945960b64f8dcff5ee8e81b95a733807768a0c2a5f329967e671d760a64239a42d6d5f9bf55b2904bf67082a4cd01ca5656bc323b041ff19 +DIST icedtea-3.18-jdk-3.18.0.tar.xz 40637140 BLAKE2B de565a2ba7cdb3732a551aa513cac3f52bf330590e011c6b05d47da1cee8389315ba3eb8112ce3c3d0510a049c49c147ea3a474eaadf70535fe30f63576fa293 SHA512 022115dbfc9ab7217a74b10e347a6a3a5eaa1112fef53cb37ff9dc003ec5bd3018b5b0bf675465d1c496e57b9b177102c6fef135acc881f3db49bea51c4f7375 +DIST icedtea-3.18-langtools-3.18.0.tar.xz 2080068 BLAKE2B e2781cc6728594a6c5e8dd213c810ae7fbed8d365da6db600e75b5786573b3d201cb0c3ed10221de1c139fe7ed55b59e57c47927272374e32ae94e586d6f0f9d SHA512 d96ded5041e488860baf1c17346e9342fb086e999fbf5d5a4dd5be97e0db17771f594c60f584d549d7ce1b4e1aa58b165a32f0633101bb70ea5c2d77758bb42b +DIST icedtea-3.18-nashorn-3.18.0.tar.xz 2323912 BLAKE2B ab0c7dc3635a6eb7feb350d56c0fd5e03b36b60b107b26dbb04262291c4c0d57077bff5f7d949d95ec1de04210e06f40600d360600db09421f1dc0f801968817 SHA512 2bd488893ac33a16480cceb16fab62c11f8032e68d84818ad20aaa4c3928af6c77c60f8bd94878aa02b703e0302847272688d8641145972071c4e9a048cd5a13 +DIST icedtea-3.18-openjdk-3.18.0.tar.xz 364932 BLAKE2B 098ae1025f0457e14a4afc7b67ad6063f99be5fa486a2f6e187e490fe7b87efbf1cdc6fad2b33f7ae4f92817d5a0410254c723853a2519dacb5c21961c4d7558 SHA512 b4b40d19bb12ae85d68b110eb51051c089a9b7e857eceb10429b609a9f11671cbee34cfcef5c89ef23ad6aea80e4bcad1ed085fb310e09942816c5dccc8f171d +DIST icedtea-3.18-shenandoah-3.18.0.tar.xz 7279864 BLAKE2B 1d8cfccda9cf24a5522862634d3699a7bd9cd445da7a08ab2061da45ddb885e023d56c096813710ef4f7ddb458300737bae21a56900bfb00e3ed5ac696af2059 SHA512 f8c5d4f108a3575f154a462e8cf907c14fbcdfc95708ebabbf530a79cc66979cc7e141cd239d6603e4a47d114130b07e6f32edb9145930e573a239fa0c91e75b +DIST icedtea-3.18.0.tar.xz 1565468 BLAKE2B e6bffb9860ae8824a96e55970056025bc426453c26f91a7eb52f01f5ada7c0cb0bdcc4efa503186f514759f914d9053d08ba540bde7d15be81736037ce5d8db5 SHA512 e94c365513e5fa8a17d61fe7957db85018510567df9ba115c9bca98c658257ff1f4dff7967e88b73088630f07670beeaa8cbe49706d6bd02fb2804abad5d95b1 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.17.0.ebuild 12309 BLAKE2B 749c85a4365c8ce9330de196578f8a7b4cdaac48608e24c50df9244e27e95f62ef97c5b5652cf1af25b3042dfe537344acb617efe54b5cd481b971bb620f7a6f SHA512 9770ce5deb3950ceda3d5fd4089c09feaea93c2181751a561a4166333f727f7afd3a46d0b49bd15174184e1a4b5a72f866d2fdf679886b0e8cd52f8445b29ac7 -EBUILD icedtea-3.17.1.ebuild 12309 BLAKE2B 37146e81d1edc8dd7fc12baa6ed22c4498cc9768d95d14f371003b60d4eb52df0249f3a9a0f15832a78cf52aef3453684b2b5aa57129ed77a48189d9adc36b0c SHA512 edb424109fae679985c7b53eddced8aa926bf812291a2a580b37d8430c4e4e6b506a04db15a5f9cd86151102c1dc1dd4636c39e1ccfe3f604006f587633098e3 +EBUILD icedtea-3.18.0.ebuild 12444 BLAKE2B 067eb985809926407278329743801f66839f4d669f72b8c8586af86421ebb18eb67f8d5da9754199c96e89f904001893ed244e88a13f71692c79ff77d1334b9b SHA512 4a29356a7ad8ff66cde98666ed494ec79581f6276e48ce44000c83fee027118ae48fe05689e052aae405dd510d53d725b4a2c864ee6ff637de086b2d3dab91d8 MISC metadata.xml 2108 BLAKE2B 3160040a91a46f2b5dc9be02405ad35849b5c02ddfae81a17ec47a15bd9103cb17bcd0c1065a660e3ffcd4e8d815fffab4c020d3dfbe5e9936826bb15072e00d SHA512 fdcb8411daaabf953bbb75d8b58137ab1f7a3755a1c016ba431ab366177eb91e9cef365fc921d989384f076c589fc46358838d4a4c86cd50955cfcfc9b97dd74 diff --git a/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch new file mode 100644 index 000000000000..ba5283f15771 --- /dev/null +++ b/dev-java/icedtea/files/openjdk-8-hotspot-arrayallocator.patch @@ -0,0 +1,16 @@ +Workarounds build error: +Error: dl failure on line 895 +Error relocating .../libjvm.so: _ZN14ArrayAllocatorImL10MemoryType7EE4freeEv: symbol not found + +Possibly due to g++ 10.x error on not properly instantiating the template. + +--- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig 2020-11-10 14:07:08.372045326 +0200 ++++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp 2020-11-10 14:08:07.911412813 +0200 +@@ -42,6 +42,7 @@ + # include "os_bsd.inline.hpp" + #endif + ++template class ArrayAllocator<BitMap::bm_word_t, mtInternal>; + + BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) : + _map(map), _size(size_in_bits), _map_allocator(false) diff --git a/dev-java/icedtea/icedtea-3.17.0.ebuild b/dev-java/icedtea/icedtea-3.17.0.ebuild deleted file mode 100644 index 0699e1a02b52..000000000000 --- a/dev-java/icedtea/icedtea-3.17.0.ebuild +++ /dev/null @@ -1,379 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) - -# ********************************************************* -# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * -# ********************************************************* - -EAPI="6" -SLOT="8" - -inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs versionator xdg-utils - -ICEDTEA_VER=$(get_version_component_range 1-3) -ICEDTEA_BRANCH=$(get_version_component_range 1-2) -ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -ICEDTEA_PRE=$(get_version_component_range _) - -CORBA_TARBALL="${PV}.tar.xz" -JAXP_TARBALL="${PV}.tar.xz" -JAXWS_TARBALL="${PV}.tar.xz" -JDK_TARBALL="${PV}.tar.xz" -LANGTOOLS_TARBALL="${PV}.tar.xz" -OPENJDK_TARBALL="${PV}.tar.xz" -NASHORN_TARBALL="${PV}.tar.xz" -HOTSPOT_TARBALL="${PV}.tar.xz" -SHENANDOAH_TARBALL="${PV}.tar.xz" -AARCH32_TARBALL="${PV}.tar.xz" - -CACAO_TARBALL="cacao-c182f119eaad.tar.xz" -JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz" - -CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}" -JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}" -JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}" -JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}" -LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}" -OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}" -NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}" -HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}" -SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}" -AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}" - -CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}" -JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}" - -DROP_URL="https://icedtea.classpath.org/download/drops" -ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}" - -DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies" -HOMEPAGE="https://icedtea.classpath.org" -SRC_PKG="${ICEDTEA_PKG}.tar.xz" -SRC_URI=" - https://icedtea.classpath.org/download/source/${SRC_PKG} - ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL} - ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL} - ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL} - ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL} - ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL} - ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL} - ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL} - ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL} - shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} ) - arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} ) - ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL} - ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}" - -LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -IUSE="+alsa cacao +cups doc examples +gtk headless-awt - jamvm +jbootstrap kerberos libressl pax_kernel +pch - pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero" - -RESTRICT="!test? ( test )" -REQUIRED_USE="gtk? ( !headless-awt )" - -# Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" -X_COMMON_DEP=" - >=media-libs/giflib-4.1.6:0= - >=media-libs/libpng-1.2:0= - >=x11-libs/libX11-1.1.3 - >=x11-libs/libXext-1.1.1 - >=x11-libs/libXi-1.1.3 - >=x11-libs/libXrender-0.9.4 - >=x11-libs/libXtst-1.0.3 - x11-libs/libXcomposite" -X_DEPEND=" - x11-base/xorg-proto - >=x11-libs/libXau-1.0.3 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2" - -# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn -COMMON_DEP=" - >=dev-libs/glib-2.26:2= - >=dev-util/systemtap-1 - media-libs/fontconfig:1.0= - >=media-libs/freetype-2.5.3:2= - >=sys-libs/zlib-1.2.3 - virtual/jpeg:0= - kerberos? ( virtual/krb5 ) - sctp? ( net-misc/lksctp-tools ) - smartcard? ( sys-apps/pcsc-lite ) - system-lcms? ( >=media-libs/lcms-2.9:2= )" - -# Gtk+ will move to COMMON_DEP in time; PR1982 -# gsettings-desktop-schemas will be needed for native proxy support; PR1976 -RDEPEND="${COMMON_DEP} - !dev-java/icedtea:0 - !dev-java/icedtea-web:7 - >=gnome-base/gsettings-desktop-schemas-3.12.2 - >=sys-apps/baselayout-java-0.1.0-r1 - virtual/ttf-fonts - alsa? ( ${ALSA_COMMON_DEP} ) - cups? ( ${CUPS_COMMON_DEP} ) - gtk? ( - >=dev-libs/atk-1.30.0 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/pango-1.24.5 - ) - !headless-awt? ( ${X_COMMON_DEP} ) - selinux? ( sec-policy/selinux-java )" - -# ca-certificates, perl and openssl are used for the cacerts keystore generation -# perl is needed for running the SystemTap tests and the bootstrap javac -# lsb-release is used to obtain distro information for the version & crash dump output -# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2 -# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h) -# Ant is no longer needed under the new build system -DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} - || ( - dev-java/openjdk-bin:8 - dev-java/openjdk:8 - dev-java/icedtea-bin:8 - dev-java/icedtea:8 - ) - app-arch/cpio - app-arch/unzip - app-arch/zip - app-misc/ca-certificates - dev-lang/perl - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl:0 ) - sys-apps/attr - sys-apps/lsb-release - x11-libs/libXt - virtual/pkgconfig - pax_kernel? ( sys-apps/elfix )" - -PDEPEND="pulseaudio? ( dev-java/icedtea-sound )" - -S="${WORKDIR}"/${ICEDTEA_PKG} - -icedtea_check_requirements() { - local CHECKREQS_DISK_BUILD - - if use doc; then - CHECKREQS_DISK_BUILD="9000M" - else - CHECKREQS_DISK_BUILD="8500M" - fi - - check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - icedtea_check_requirements -} - -pkg_setup() { - icedtea_check_requirements - - JAVA_PKG_WANT_BUILD_VM=" - openjdk-8 openjdk-bin-8 - icedtea-8 icedtea-bin-8" - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack ${SRC_PKG} -} - -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 #nowarn - - # icedtea doesn't like some locales. #330433 #389717 - export LANG="C" LC_ALL="C" - - local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config - local vm=$(java-pkg_get-current-vm) - - # gcj-jdk ensures ecj is present. - if use jbootstrap || has "${vm}" gcj-jdk; then - use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\"" - config+=" --enable-bootstrap" - else - config+=" --disable-bootstrap" - fi - - # Use Zero if requested - if use zero; then - use_zero="yes" - fi - - # Use JamVM if requested - if use jamvm; then - use_jamvm="yes" - fi - - # Use CACAO if requested - if use cacao; then - use_cacao="yes" - fi - - # Are we on a architecture with a HotSpot port? - # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86. - if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then - hotspot_port="yes" - # Work around stack alignment issue, bug #647954. - use x86 && append-flags -mincoming-stack-boundary=2 - fi - - # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... - # Otherwise use Zero for now until alternate VMs are working - if test "x${hotspot_port}" != "xyes"; then - use_zero="yes" - fi - - if use shenandoah; then - if { use amd64 || use arm64; }; then - hs_config="--with-hotspot-build=shenandoah" - hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}"" - else - eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah"" - fi - else - if use arm ; then - hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}"" - else - hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}"" - fi - fi - - # Turn on JamVM if needed (non-HS archs) or requested - if test "x${use_jamvm}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-jamvm"' - fi - ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"' - jamvm_config="--enable-jamvm" - fi - - # Turn on CACAO if needed (non-HS archs) or requested - if test "x${use_cacao}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' - ewarn 'If so, please rebuild with USE="-cacao"' - fi - ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"' - cacao_config="--enable-cacao" - fi - - # Turn on Zero if needed (non-HS/CACAO archs) or requested - if test "x${use_zero}" = "xyes"; then - if test "x${hotspot_port}" = "xyes"; then - ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.' - fi - zero_config="--enable-zero" - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - config+=" --enable-precompiled-headers" - else - config+=" --disable-precompiled-headers" - fi - - config+=" --with-parallel-jobs=$(makeopts_jobs)" - - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - # force bash for now https://bugs.gentoo.org/722292 - CONFIG_SHELL="${EPREFIX}/bin/bash" econf ${config} \ - --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \ - --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \ - --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \ - --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \ - --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \ - --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \ - --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \ - --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \ - --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \ - --with-jdk-home="$(java-config -O)" \ - --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ - --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ - --with-pkgversion="Gentoo ${PF}" \ - --disable-ccache \ - --disable-downloading --disable-Werror --disable-tests \ - --disable-systemtap-tests --enable-improved-font-rendering \ - --enable-system-jpeg --enable-system-zlib \ - $(use_enable headless-awt headless) \ - $(use_enable !headless-awt system-gif) \ - $(use_enable !headless-awt system-png) \ - $(use_enable doc docs) \ - $(use_enable kerberos system-kerberos) \ - $(use_enable system-lcms) \ - $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \ - $(use_enable sctp system-sctp) \ - $(use_enable smartcard system-pcsc) \ - ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config} -} - -src_compile() { - default -} - -src_test() { - default -} - -src_install() { - default - - local dest="/usr/$(get_libdir)/icedtea${SLOT}" - local ddest="${ED}${dest#/}" - - if ! use alsa; then - rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die - fi - - if ! use examples; then - rm -r "${ddest}"/demo "${ddest}"/sample || die - fi - - if ! use source; then - rm -v "${ddest}"/src.zip || die - fi - - dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}" - - # Fix the permissions. - find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die - - dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts - - java-vm_install-env "${FILESDIR}/icedtea.env.sh" - java-vm_sandbox-predict /proc/self/coredump_filter -} - -pkg_postinst() { - xdg_icon_cache_update - java-vm-2_pkg_postinst - einfo "JavaWebStart functionality provided by icedtea-web package" -} - -pkg_postrm() { - xdg_icon_cache_update - java-vm-2_pkg_postrm -} diff --git a/dev-java/icedtea/icedtea-3.17.1.ebuild b/dev-java/icedtea/icedtea-3.18.0.ebuild index 3facf26dfd28..0ec907375811 100644 --- a/dev-java/icedtea/icedtea-3.17.1.ebuild +++ b/dev-java/icedtea/icedtea-3.18.0.ebuild @@ -7,15 +7,14 @@ # * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL * # ********************************************************* -EAPI="6" +EAPI=6 SLOT="8" -inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs versionator xdg-utils +inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix toolchain-funcs xdg-utils -ICEDTEA_VER=$(get_version_component_range 1-3) -ICEDTEA_BRANCH=$(get_version_component_range 1-2) +ICEDTEA_VER=$(ver_cut 1-3) +ICEDTEA_BRANCH=$(ver_cut 1-2) ICEDTEA_PKG=icedtea-${ICEDTEA_VER} -ICEDTEA_PRE=$(get_version_component_range _) CORBA_TARBALL="${PV}.tar.xz" JAXP_TARBALL="${PV}.tar.xz" @@ -77,10 +76,9 @@ RESTRICT="!test? ( test )" REQUIRED_USE="gtk? ( !headless-awt )" # Ideally the following were optional at build time. -ALSA_COMMON_DEP=" - >=media-libs/alsa-lib-1.0" -CUPS_COMMON_DEP=" - >=net-print/cups-1.2.12" +ALSA_COMMON_DEP=">=media-libs/alsa-lib-1.0" +CUPS_COMMON_DEP=">=net-print/cups-1.2.12" + X_COMMON_DEP=" >=media-libs/giflib-4.1.6:0= >=media-libs/libpng-1.2:0= @@ -89,12 +87,15 @@ X_COMMON_DEP=" >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 - x11-libs/libXcomposite" + x11-libs/libXcomposite +" + X_DEPEND=" x11-base/xorg-proto >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXinerama-1.0.2" + >=x11-libs/libXinerama-1.0.2 +" # The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn COMMON_DEP=" @@ -104,13 +105,19 @@ COMMON_DEP=" >=media-libs/freetype-2.5.3:2= >=sys-libs/zlib-1.2.3 virtual/jpeg:0= + gtk? ( + >=dev-libs/atk-1.30.0 + >=x11-libs/cairo-1.8.8 + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-2.8:2 + >=x11-libs/pango-1.24.5 + ) kerberos? ( virtual/krb5 ) sctp? ( net-misc/lksctp-tools ) smartcard? ( sys-apps/pcsc-lite ) - system-lcms? ( >=media-libs/lcms-2.9:2= )" + system-lcms? ( >=media-libs/lcms-2.9:2= ) +" -# Gtk+ will move to COMMON_DEP in time; PR1982 -# gsettings-desktop-schemas will be needed for native proxy support; PR1976 RDEPEND="${COMMON_DEP} !dev-java/icedtea:0 !dev-java/icedtea-web:7 @@ -119,17 +126,10 @@ RDEPEND="${COMMON_DEP} virtual/ttf-fonts alsa? ( ${ALSA_COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) - gtk? ( - >=dev-libs/atk-1.30.0 - >=x11-libs/cairo-1.8.8 - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.8:2 - >=x11-libs/pango-1.24.5 - ) !headless-awt? ( ${X_COMMON_DEP} ) - selinux? ( sec-policy/selinux-java )" + selinux? ( sec-policy/selinux-java ) +" -# ca-certificates, perl and openssl are used for the cacerts keystore generation # perl is needed for running the SystemTap tests and the bootstrap javac # lsb-release is used to obtain distro information for the version & crash dump output # attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2 @@ -198,6 +198,13 @@ src_configure() { append-flags -fcommon append-flags -fno-delete-null-pointer-checks -fno-lifetime-dse fi + # this patch helps with gcc10 as well + # since build system unpacks tarballs itself, this is a way to force makefile + # to apply our patch. it expects relative path inside source, so we can't specify + # ${FILESDIR} directly. + mkdir -v gentoo_patches || die + cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die + export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch" # For bootstrap builds as the sandbox control file might not yet exist. addpredict /proc/self/coredump_filter #nowarn |