openjdk-12: apply make-4.3 patch.

This commit is contained in:
Andrius Štikonas 2021-12-18 16:34:11 +00:00
parent 8a771c5f74
commit dc7d368291
3 changed files with 5 additions and 4 deletions

View File

@ -10,7 +10,6 @@ AUX musl/11/ppc64le.patch 8951 BLAKE2B 27ac988f2cd9af6045fd0945296832f9f6ef012e1
AUX musl/12/aarch64.patch 279 BLAKE2B a32e40c9b8b3be35b0fe35c4435a9f3a97070a2b84c8f8b47f124f9535244c92600c20914c5b9ee5b07938b0f1802fe9dd90b625b6b766b5e3da2c24a45056ba SHA512 15735b0a54e918a1b52df47d96024ef2b649b5773578885273d985acc2f0abfb17b70656d2e5c492458ddb8733a2a825fd6153bf051127d8faf67f1fe1e872ca
AUX musl/12/build.patch 18767 BLAKE2B 3040195142dc0b74022ab59483b009b7f1a9bfd87a53efc5aac5ff5c6430473027bab5eb33db2f6dd0e04533898e10082dab202b45226c5fa50c7b5e730c5340 SHA512 55b98c25d01278addd212bb6e5954a219272c34b555786fc27ff61a1d73ad0991a59fe64bbe25f9d476ca64b6697ca77da345b42f70bca940640bb77086c52d3
AUX musl/12/fix-bootjdk-check.patch 953 BLAKE2B c0f5a527491616a6272edd420615f754d2eaf07f761a6f95c5744dd0fff4dba897bee1eedb62075bfd5d3661f744ab13b099b3d07c1eca5739b15033321d3d86 SHA512 1892a87b6b9fc66a15bdb38fa6ee6c673a78a1f402d6eda0b2d2d621cb75914dfcc41b1407a1673421e9ef0f6ec3da66988cd7c4fff82725c1d341be3f30c0cb
AUX musl/12/make-4.3.patch 740 BLAKE2B 973e21bfbfae8ead6184179f62594cfadecd14f9fa2fd0bce7c063899c4233bba2c36388284cc7adaaf2176391257543fe0df09560979f882d0c61916f12c9ed SHA512 ee8ba62ab5909648dccc1d5e1d12b4f35e813320a7919476bc1ff35bc2ef51030df3426616e0f636dd64a8b07021201f7bcb477253bb33a97cd0db8a6684137c
AUX musl/12/ppc64le.patch 7546 BLAKE2B d44084d93aedfc7ab775e0380c40c6b02c0b50bdca9b5e2cbd501f186a11142971eb5598925495aad65b1254218957ab2867a7da1b76c415ad95703addd0081a SHA512 fe96fd76dff9b44757c1410574b0ed32a96ea02a7bfee947fcf88ef6ac8b375fd910afe39915e3e1449014df9c08817c6903769c0dbfcc2289368fabf075e014
AUX musl/13/aarch64.patch 344 BLAKE2B aef628f7605a1bd94fe1c95fb646ea9bc1f9160c0ce3b36afdfb4eab1955c8e0c1fce8217b13cc164a23b6469fbb642f2759f55273232dee9bbe00eb1786567c SHA512 1ce3e4ae2c8b93573f35a17836ffda8e36055ac947e7c472ae159141e2adf7134afc756f784bc2f7010ac7c31a8a2418aae964e913d8c84833053072e10aca07
AUX musl/13/build.patch 18898 BLAKE2B 4b86bb0ef5986dfe2d1706524c8311fbe9d6ce57e5906a527d3a3109bcd58ef14a7975383deb821dd45f535216a76e551f21db9522caeeb9e55cc5650377f72e SHA512 d082d47232e343d3bb7e491286ce4cdcebeca996c1006749c70311a71a03baf76375f507832dbf4abeae1d7b83e1a51e3b997ef23dba48df30bf347aa7842c9e
@ -61,6 +60,7 @@ AUX openjdk-9.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea
AUX patches/10/aarch64_gcc_fix.patch 371 BLAKE2B 4662b97aba0022cfbf8f781425ffbf6ac68c444a468d4a8f2f70584f76c3d8ba04a65c600604e15ba2d0ace4a33b7c74ad2a060fcd6174d6212122a7b7eb2744 SHA512 f4f1bd49bb459caf62a5ef6bf96e0f7c69e8c40dec9a5413549d3b90dc29c8edf8d57e79d3810c5052253eea3d91131a94ea1ebade0f1e0b904724bae4dd5c3f
AUX patches/10/make-4.3.patch 741 BLAKE2B 6dab3601e6a6260f9813fab663211d8afe7fc08ff1af243bbd8ad90f8c58df5c713aec5cea7788eeabee9fce17e0aec5cf9b6f19becd5baf37a772773a445b36 SHA512 7d6ada121fbd7a4b29459b000fca225b3fb7d95d855459d43749d6ece60b8282418bd349cf235ccd41b86ac36b158e81f3184884883a551c240cb30dfe66fccd
AUX patches/10/pointer-comparison.patch 471 BLAKE2B 807c0970dc766d5fea54b8af1d2d0cdddfe75368bca32c6a8cb2c516db21c5e8056fce7715eb1b33ece68970ce6e0686bd061194ac2829432ad44da010767858 SHA512 48faf682eeb2d57873148d3fd948c66d20eebab360ce31352761ff5400bafbeca55a85dded04c38a0e4263d14521b4da41fd02b608b774e4d8e3784452c5c847
AUX patches/12/make-4.3.patch 740 BLAKE2B 973e21bfbfae8ead6184179f62594cfadecd14f9fa2fd0bce7c063899c4233bba2c36388284cc7adaaf2176391257543fe0df09560979f882d0c61916f12c9ed SHA512 ee8ba62ab5909648dccc1d5e1d12b4f35e813320a7919476bc1ff35bc2ef51030df3426616e0f636dd64a8b07021201f7bcb477253bb33a97cd0db8a6684137c
AUX patches/16/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
AUX patches/17/1001_ppc64le.patch 9158 BLAKE2B 6bf533c332ac2684216c394e13008bc8d806f2d938b94052cf7f8b267afe585b2bc607b3721c135c7516916595a5ab6ac84fcd96db5754c6cc05279c8c993698 SHA512 05845450afd2d8be9f9f3a69d24c92f2e18593beeb43d748efee53e92edaedacdde2bfcf46b07eb702e036fd3defe2e6418628c26d8e6114653aa521a5d309ce
AUX patches/9/aarch64_gcc_fix.patch 377 BLAKE2B b94336be65f16831c63cb3288d71b48c9c0c12e91a3612501895b924791d41c94eae1cae35e64ff03f7ba873463d78fff09652c4fe2f0bc749697d82f9ea4e8b SHA512 d4666e419559b10d4d2c0b3ec7b10ce6607e8480ffac6a8685263e0997d8bd43b059244f1beb452759a8a2e86a867d03e5e44793b62b2fe0a4a3dc00a5dd6ad9
@ -101,7 +101,7 @@ DIST openjdk-nashorn-8.272_p10.tar.bz2 2850055 BLAKE2B 2348c0f45916101d9fcb4aaa2
DIST openjdk-nashorn-9.0.4_p12.tar.bz2 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97
EBUILD openjdk-10.0.2_p13.ebuild 8436 BLAKE2B bd131f53e24af1017840de009275b8529e7f63fa564f58aa04824d8b8c56a92d2773db7fd941ed4048dd403ca2504d16f8e664a2cf0677e82471b4e6dc34a4f5 SHA512 8c066b1479e6e5a0428ae8ac6dae9fd7e133c05173b80e72031049dd83624401ca250d7a28e3212d123bb53f4ee2964794dabc71202a67d1110f1725971d128f
EBUILD openjdk-11.0.9_p11.ebuild 8408 BLAKE2B d191259f7cab2db1841825832104a3eaf1755bdf6f05d5325b13402771102b2dee85af652e290b91c050c1f7a0ecb43718b2d050eae08b68aa5319be7d7c0d40 SHA512 be78a0edc4eeacadde35ebdca9f1bd5f09af08d890cde1fa97df9587205bc84efd181b2980436dad0b2f6e378d398ce4a4d15f3c003900a6d40f0a7ba0fb2064
EBUILD openjdk-12.0.2_p01.ebuild 8436 BLAKE2B dfe25378ceff511abb9fbff5a7753315137ae1878b05f4d5f1581861515719dea8c0c814330413ba6b2bf54062c90b59cf86e7218e5ce179195be2db2845fd4c SHA512 76fbc83bf49e239c611d8f14653abe17d1a416b83d87e9083105bbc5d914b14604bcad2c439aaa17c8819ad07ec438c87b3223e7e6345a7cc728d16dade3af40
EBUILD openjdk-12.0.2_p01.ebuild 8439 BLAKE2B 071f12374676fc8956f6feb24f5f6ddc8b02fa2437475869f881952d45c436f4fcf5aaca19a7cae6564d49c0242c4267639a1304796b458ed17059204c7c817d SHA512 53de2d53ef40193c45c92eaaeef51ceb172eeadf87b9875781215e19f03378eb2fc3b9e0cec33fdda020c38b8cf3e64f68b7adca537cff211a3e53862186d64a
EBUILD openjdk-13.0.4_p01.ebuild 8417 BLAKE2B 521f065801713eec3290d6fca3ae224f8fae56c026dedcc9e609d9ad92bf2c21ba195d785b8936a1099bb69109fc744132e8876f8e15dcd85f8304cbf1771c4e SHA512 5c08b3a707929881bdac4b8759851f4f0b80482245890568149adadded1e597a8260e707264cf85ea082f610a1f290ca9a00961f78af38466e433f867bd8a8c9
EBUILD openjdk-14.0.2_p01.ebuild 8419 BLAKE2B cdf793ba4d051f57c89027fca2a42666227974d2d1dc9191d9ef21f18110fa302fa6dfbe0a1daf3a6609e1458319f2a6150c1c07180096f1ccd66206160e77fd SHA512 d18978808c7ee2c530eabe1d749681ad50314366590d7683b39854dee9b07f6a609b115ecfc58e021bda493c0eec8e17ff0178fe3b8261675feaf152b9c97f4a
EBUILD openjdk-15.0.0_p36.ebuild 8645 BLAKE2B 8a4516e98f32bb038b6a5b0123bba4615842c6d19ed1fc1416c71f789d5ca6e366d8a71501d650c3a77304d80f3140a1e437b98b3045186ee538a81307d5f457 SHA512 7e637fae9f756c290479602175f8c9ca5d31a5d75fe69b21fb54e0aba2b559d4329e03f20935b8109a946bcf6063996f6f42a25693c3f2ad62590ff6bbb1a379

View File

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -138,7 +138,6 @@ src_prepare() {
if use elibc_musl; then
eapply "${FILESDIR}/musl/${SLOT}/build.patch"
eapply "${FILESDIR}/musl/${SLOT}/fix-bootjdk-check.patch"
eapply "${FILESDIR}/musl/${SLOT}/make-4.3.patch"
eapply "${FILESDIR}/musl/${SLOT}/ppc64le.patch"
eapply "${FILESDIR}/musl/${SLOT}/aarch64.patch"
fi
@ -152,6 +151,8 @@ src_prepare() {
fi
chmod +x configure || die
eapply "${FILESDIR}/patches/${SLOT}/make-4.3.patch"
}
src_configure() {