andrius
/
gentoo-bootstrap
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

java: Use DISTRIBUTION_PATCHES shell variable to apply additional patches.

This commit is contained in:
Andrius Štikonas 2020-07-15 20:44:15 +01:00
parent 1bc474da0b
commit 7ea413975a
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev-java/icedtea/Manifest
View File

@ -1,4 +1,3 @@
AUX additional_patches.patch 447 BLAKE2B d952037e1d422b05d2a937820e3496dedcfee0b4fae1ede7004f25a5c64466a4eea92ab67a9329371a543f64db85eb19f9cb926b905a8592435f8bfdf57193c4 SHA512 51e86eabd715fe9c0702c46c46dcccbebe822487e3c1226027776ec68a038676f4ed43681922808bebc6cdb0baccd5268bf967e47bd76325d30b2c03b27f03c1
AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
AUX icedtea.env.sh 1130 BLAKE2B 8ffd3a9c558b9abb9df723efc531496537d7883d676c145411d9a4f02ecd6826c5edec9451ced8187224a9c24b408e6cbad3dc11ebcbe2f69a38b0966cb691c7 SHA512 79c279338cc2790df91c92d8d9b97c007f1a030374066dfacbbb2f9aac754eafba9197b748adcb9fe6fbff16bd998b6536298443028df281d1b12d3b348da66f
AUX jamvm-1.6.0-aarch64-support.patch 23347 BLAKE2B b80462ea9d8ceb54f8039d1a2c6e161a45eceabcd5e27993dec602605397d70754bcc4c70fcc6be197f17a7d1383d6d91ae57c01063dbc55c61537f50fb71de6 SHA512 aa602103865d64dc0d53d8d46002888b99afb7b92e95f39dacd36a2d3b937006f7816826efc418d0e3b9e7b3eec5b0b01a1642e37875635577c0c5653418596c
@ -26,4 +25,4 @@ 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.7.0.ebuild 13476 BLAKE2B 83ff27f01a25038abf19cbfe5b13d495fe1845e112d6fa916f3192664779ae5bcef95b6b3d0fe189cf5c5baa24dae6ab901b9c50ee99f6679a4a1b6ffd6d4720 SHA512 beacbf9b65aba5ca2a624f1d3a68245feee9331b694e3a0f6993eacfdae78332174702bed0933809d97e8d5ee2ed2a1007e31f5e246720d2baa3ad0e47dc4619
EBUILD icedtea-7.2.6.9.ebuild 11399 BLAKE2B 900e633728ab3e802d6230926e860eb99bb98e285af7b50ddd316c31ad8b8bace62871513dcf0b7a4eafebb209ea831776172bf5c902e8d03d38a0885e5df080 SHA512 1418e3319be53299bb9aef32744b1759e4271d1b98eb4c4f663fd7cdff56f0d28db926486b4abb6013faf5526b3354d4835e94603d2dd17cf959e8829fc878f4
EBUILD icedtea-7.2.6.9.ebuild 11581 BLAKE2B 9f345d9e77df6e08248b715c3ff706ab796456d703299459b0e4cf56b51b4f8725cba99565e907f78de39b9f12fa1ef102df70bb12452a15a438bbb0a2a2a3c6 SHA512 a06c1e882cb57095889cc2ca296f55a5165354a5b1554eb397da4cf6b485217ec3eb5272661ff600cec547fb6fa4433aa8322f94ef9c18b7fab56d34f79eae0d

13
dev-java/icedtea/files/additional_patches.patch
View File

@ -1,13 +0,0 @@
--- a/Makefile.am 2020-07-11 13:44:32.099191644 +0100
+++ b/Makefile.am 2020-07-11 13:45:23.436056479 +0100
@@ -408,7 +408,9 @@
patches/jamvm/pr2172-tempdir.patch \
patches/jamvm/noexecstack.patch \
patches/jamvm/pr2665.patch \
- patches/jamvm/pr3134-unsafe_methods.patch
+ patches/jamvm/pr3134-unsafe_methods.patch \
+ patches/jamvm/jamvm-1.6.0-aarch64-support.patch \
+ patches/jamvm/jamvm-1.6.0-opcode-guard.patch
endif
if ENABLE_NSS

16
dev-java/icedtea/icedtea-7.2.6.9.ebuild
View File

@ -168,12 +168,8 @@ pkg_setup() {
src_unpack() {
unpack ${SRC_PKG}
cp "${FILESDIR}/jamvm-1.6.0-aarch64-support.patch" "${S}/patches/jamvm"
cp "${FILESDIR}/jamvm-1.6.0-opcode-guard.patch" "${S}/patches/jamvm"
cd "${S}"
eapply "${FILESDIR}/additional_patches.patch"
eautoreconf
ln -s "${FILESDIR}/jamvm-1.6.0-aarch64-support.patch" "${S}/patches/jamvm" || die
ln -s "${FILESDIR}/jamvm-1.6.0-opcode-guard.patch" "${S}/patches/jamvm" || die
}
src_configure() {
@ -188,6 +184,14 @@ src_configure() {
local cacao_config config hotspot_port jamvm_config use_cacao use_jamvm use_zero zero_config
local vm=$(java-pkg_get-current-vm)
# Export patches for configure
DISTRIBUTION_PATCHES=""
DISTRIBUTION_PATCHES+="patches/jamvm/jamvm-1.6.0-aarch64-support.patch "
DISTRIBUTION_PATCHES+="patches/jamvm/jamvm-1.6.0-opcode-guard.patch "
export DISTRIBUTION_PATCHES
# 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\""