icedtea7: fix broken icedtea after systemtap removal.

This commit is contained in:
Andrius Štikonas 2021-12-12 13:49:49 +00:00
parent 4e7ca9097a
commit 6c28c532c4
4 changed files with 7 additions and 5 deletions

View File

@ -1,5 +1,4 @@
AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
AUX icedtea-disable-systemtap.patch 986 BLAKE2B 9fe690c923fab5a23d16c10d4309454f474b806b41e70e83a3f285c74216ef5c8201df06f1f329fb606bf802776d3947cdcc58add56bf304947195dad5486501 SHA512 c1863a99754715c114982fc480ee8ef92ac5252bd20234e1d4088bb2306acc50f9f3aebe1987e16c81cde00491e7b575ff7b32df1fa83b072b33a38c2f7be398
AUX icedtea-hotspot-stop-using-obsolete-isnanf.patch 1871 BLAKE2B b26f273922ee9602d10938e4023724bb5df544a4bb3a67af31af6241db10e827f33a2000d54bc2672c8af9763735ef16c8f48c40947067c719ff859786d656c6 SHA512 8bfe6ff11e25ca32862ba48ae969b31327d3da24702ef6eb06093e0f41348c677f91e5f98cac2ce6bef32415a15d5b1df47a92e787cd602cc581bb69e2eccc60
AUX icedtea-jdk-execinfo.patch 1026 BLAKE2B c09c343ead869275a945d5e2437c833a641728fc39ad3e9218291fd12376b6684fbcf7f129b69fcd1bde11949c6998865b131ee0734cc33d80f332eb7261428e SHA512 0391970e6a32946aa3cccf38fdef9c0fe2af26cd0df824b98aa2fcfa1bf661d4a68e339bffcfd16f386c565fc68bb28a29208a67d4bad8a0e847ad02bd8becbb
AUX icedtea-jdk-fix-build.patch 2150 BLAKE2B ebfc48db63836bd3f60f946ad2a647ddfa3aea3e97742a475098ae8a8cd4a4a8b1bc9986f3b41d98c8da49713d374c39aff2199bcaebbb8a2fc112d2de805bb7 SHA512 213a537de5f011cb39d608515c3413513ac75fb93593f9a9ef4205f71d72bdd8b097c80db185f7b26021d5bb85045b866f34f3478482dc4189972d8614a13458
@ -7,6 +6,7 @@ AUX icedtea-jdk-musl.patch 4861 BLAKE2B 40028881fd456a7643501aee235e015039ea7e36
AUX icedtea-jdk-no-soname.patch 369 BLAKE2B e44f1f539abd742963664a6f64cdd8aaaa7b108b20535ca0a5a20b0892a083e81b676fd1c71a6b021b2fa1f15404520be388f14ac326ac909f0a11f1aac20864 SHA512 bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1
AUX icedtea-os_linux-remove-glibc-dependencies.patch 2954 BLAKE2B 0983be4b18a5a28722a21bc70780559197df4553ce5deff34cfe40819c92deb48242e7792ad8e773dabe534945a1d0e067c96516393c3708c595a7d757d9caef SHA512 64fd0392235d826ded265e5b2ab5a3aecff0f45e44abf4af7815a42fd0bb7880313d585a16c15c72a365472b8429985ca7c2570bb44467e34292e35ec642a50d
AUX icedtea.env.sh 1130 BLAKE2B 8ffd3a9c558b9abb9df723efc531496537d7883d676c145411d9a4f02ecd6826c5edec9451ced8187224a9c24b408e6cbad3dc11ebcbe2f69a38b0966cb691c7 SHA512 79c279338cc2790df91c92d8d9b97c007f1a030374066dfacbbb2f9aac754eafba9197b748adcb9fe6fbff16bd998b6536298443028df281d1b12d3b348da66f
AUX icedtea7-disable-systemtap.patch 986 BLAKE2B 9fe690c923fab5a23d16c10d4309454f474b806b41e70e83a3f285c74216ef5c8201df06f1f329fb606bf802776d3947cdcc58add56bf304947195dad5486501 SHA512 c1863a99754715c114982fc480ee8ef92ac5252bd20234e1d4088bb2306acc50f9f3aebe1987e16c81cde00491e7b575ff7b32df1fa83b072b33a38c2f7be398
AUX icedtea7-hotspot-miscompile.patch 857 BLAKE2B 5e2297146aa6be2aa0380169438341f69eb4c6307ca89b2a4378579145f9c413b25ee1af823105d78668506721b2d70c2cd84f06efb4021352d127d528b2dd6e SHA512 072c65e645ce23fa1f5536357ebe5cca155fe515aa487170d034fbcfab6195a5d2ec26cc5e3212530137208db091cb842a316b5af24c5191ae1e22b45a16f17a
AUX icedtea7-hotspot-musl.patch 1820 BLAKE2B b3abc9dbdc17cee37452b1bdc4fb59e67da43ec6cf79268982548cf65f627d6ccb230e80c42b139cdb200071e553068fcb06df3a92c2c1237f8804bec2e612f4 SHA512 b2afd83433e205b5e183f39b65b5c3ad9583056363b44f68616d4abb3f003a7f26080da7e104e5bf95c570da84eea4b4b2054b5de1d2185ffd0d9fb5c22b5cc2
AUX icedtea7-hotspot-pointer-comparison.patch 1600 BLAKE2B afc83c45a80a8adf3f8a0cbfef23cacfc1e716adef70bb8d7be3cab6c7ebd765b9becc1a27c5b64d16440090ddaf7777f7b1ae675b9e0fb922cd9adea68fc5a2 SHA512 2325a5bf404c1c7cbe94d2837d18f15d07bcff99434d29b3fdebb189f273d09597e33820d5c0ff2912a9a9921b442bbe8a9c73f528774d0d82e5be039d93cc76
@ -58,5 +58,5 @@ DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01
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.21.0.ebuild 12495 BLAKE2B 9b25c66cc66aacb2e6a8a3dc92b2d1df5d6cda6247648c3a6b7b929700cdf2193c6b5660a5862c0099775129fa0b40387405359ed29b98f6c82ee01b38e0d675 SHA512 567dc63b38c805356cc80ffed52b9efab18f44496bd05cf1f77c5d344d97870a284ae2c456b7a5394f8b0b014a65447f8739bc5a094f181e8b52c9a447dc433b
EBUILD icedtea-3.7.0.ebuild 14516 BLAKE2B 6c009522e3a8a05f3605c879d850885088656bb9162f3239c0eff7c254edbef438fa0a910cb5a999314458d5f46769c43936c14799de51b355f3deb901657b8f SHA512 2fe01a324644ec1fb04b519dacea8487ea9b9ed39115b556879e453bd1df17e9578ef2a5cab19208459cbf113dbb6a223676edccf954cf9350bcbaf582476547
EBUILD icedtea-7.2.6.9.ebuild 13370 BLAKE2B 52192a0e020436dcd37bc7b6d117eb44f2c8d95a5915634bd3684a63ddac73d1ff2aee69af39f1a99127a4e02a674ff7407fc631197834fa7a27d22cdbc9e5dd SHA512 f3fda91e7dc045bdc779e44b672abe5721ef552ba564b45cd498d2542034e7e504880ef7e60a8836ff9373221c892891cb4cf827e0785bdfbfae4db3cfe0eeb6
EBUILD icedtea-3.7.0.ebuild 14522 BLAKE2B 67872be030e059978f9468a8a7c1af8a3d92de36bee2ac4a11d5005e3e18e85bfddf2f1677cbf0ba361550c84e06c2e251b036f8e778cc001fb74ad098321842 SHA512 5e6748a821825f9fe29f0d6e0b2199f2cb253f664bc22c9b1dc9493a3dc234283110ca7c35cb1f8628f2e04871bc029dc6ed34b3da1cf37f994ec712a462c808
EBUILD icedtea-7.2.6.9.ebuild 13429 BLAKE2B 25645c06171b5e49e593b25dadaa7eec880d1a123d711276ce878e1591e8756270ea47cd0ac2ab13eac7fe87e1644e4fb027982cc05571e95852625856384d8e SHA512 76d23debea4e9d1a4eaa16a0a80d19213c2257b9c8eb8a0021bd41b67c68f7a355fbed9b402ebc21bd119b071c0589ee196caa18ddf836b3a71334b80f943bec

View File

@ -193,7 +193,7 @@ src_prepare() {
ln -s "${FILESDIR}/${PN}-os_linux-remove-glibc-dependencies.patch" patches || die
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-pointer-comparison.patch" "${S}/patches" || die
eapply "${FILESDIR}/${PN}8-disable-systemtap.patch"
eapply "${FILESDIR}/${PN}${SLOT}-disable-systemtap.patch"
eapply_user
eautoreconf
}

View File

@ -183,7 +183,9 @@ src_unpack() {
src_prepare() {
default
sed -i 's/REQUIRED_FREETYPE_VERSION = 2.2.1/REQUIRED_FREETYPE_VERSION = 2.10.1/' patches/boot/revert-6973616.patch
sed -i 's/REQUIRED_FREETYPE_VERSION = 2.2.1/REQUIRED_FREETYPE_VERSION = 2.10.1/' patches/boot/revert-697366.patch
eapply "${FILESDIR}/${PN}${SLOT}-disable-systemtap.patch"
}
src_configure() {