From 56321338718fc3063d0139fa5c4a696b58454710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 16 Jul 2020 20:45:22 +0100 Subject: [PATCH] java: Add another musl patch for icedtea-8. --- dev-java/icedtea/Manifest | 3 +- ...8-hotspot-stop-using-obsolete-isnanf.patch | 42 +++++++++++++++++++ dev-java/icedtea/icedtea-3.7.0.ebuild | 26 ++++++------ 3 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 dev-java/icedtea/files/icedtea8-hotspot-stop-using-obsolete-isnanf.patch diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 3fbb46f..deb20df 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -10,6 +10,7 @@ AUX icedtea8-autoconf-config.patch 3529 BLAKE2B 8f3088c7a089199ab3ea6b67db81e69c AUX icedtea8-disable-systemtap.patch 569 BLAKE2B 8079c590463bb567f4be47f8db0d83ff4953e61e0d96335e10fba743914fb547585b3b90e5fb385344d5718f289d6ee10d149af36f80a23b18d715ed4a950668 SHA512 b544723b37844462a3939738bd16a0341b85e483207e204db289133e57f6a5ef3f6bde73444735c0ca786a57c6e6478f9d026b572fbe051857edddb3725ae724 AUX icedtea8-gcc-triple.patch 731 BLAKE2B 39f4368f1e22e7f036cf40eeb319898d6377b25f71be274758b9ac1b4847e7a8fdddfaa2b97cdeb43e70f659ae3023f0ae0f9d3a8f571a47d1ca3297d446e37c SHA512 b53e03a4d6ce81d301392e3fd43801641859c5cd43897eb7490e7a4ceedd4ccc568b6e4566620aa293f8e5e943401bf1e576ca3e3902960a058577d23c9b9786 AUX icedtea8-hotspot-noagent-musl.patch 3334 BLAKE2B 6595d4a2a245aea05f39c3ccbd7267249f0d0e8d0564569adf637e75c9ae7a7dfd4aa871d5bd8e924ec706570368e7e0168c4f592236c1e1f2d12e324944b872 SHA512 1545bcd15d47fb77e07cbed955d5757d96b99c659ca833db701f8711f123ccef6538a2c1fedd87d3c75f1e309ed840c4c74611f6840369c12ef30633adbdb523 +AUX icedtea8-hotspot-stop-using-obsolete-isnanf.patch 1871 BLAKE2B b26f273922ee9602d10938e4023724bb5df544a4bb3a67af31af6241db10e827f33a2000d54bc2672c8af9763735ef16c8f48c40947067c719ff859786d656c6 SHA512 8bfe6ff11e25ca32862ba48ae969b31327d3da24702ef6eb06093e0f41348c677f91e5f98cac2ce6bef32415a15d5b1df47a92e787cd602cc581bb69e2eccc60 AUX icedtea8-jdk-execinfo.patch 692 BLAKE2B ca92273d0ce717176765186c9c3039d2644f3a0935d0dc5df354caf31e031fbb13a85ec8aa2b90c6f03b2e98f021d64dfc463b1e969d76c2eb90bbc4c8f30100 SHA512 75804b229d9230f5410fcd731a99448ea5d50e1fa2ce2a39cbb21c9a9f00edef6e76561fc8c19e989b738c3e97c8e7d968a70343fc1bda6736a22d04e7db105e AUX icedtea8-jdk-fix-libjvm-load.patch 483 BLAKE2B 9d107245fe7a88a73b1ae949f54cac38bed0a763534213f940f8578dcb49b0a19001694c3aea7430cd76340eb11a45bcf3498911ec6bfe5ad5a7a29f191633ad SHA512 b135991c76b0db8fa7c363e0903624668e11eda7b54a943035c214aa4d7fc8c3e8110ed200edcec82792f3c9393150a9bd628625ddf7f3e55720ff163fbbb471 AUX icedtea8-jdk-musl.patch 5024 BLAKE2B ec3854ccbe434e71eabf81821820613c4322eb02cd42277d7fc383ba9f511e0945f2279ad13622f9e4171891845a848f697b81f4ee75ee24b9b166564eeeea2f SHA512 d2bd0a1c8637b288a0a74796e62fe3d926121270b323aff408280088296533372db87d42a690ae76743b803d30b2a2a8e9a7a3b05f457b7a65074bb39e2838e8 @@ -37,5 +38,5 @@ DIST icedtea-3.7.0.tar.xz 1487360 BLAKE2B efef75c5ac615c21310f16f50fc425c5a76076 DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01ec389f3682cf3164d06f5404d1d16359c87b37d6ae4101f7c33cde30bad4f3d52af18f0f410e36868b2c9d1280661d2340e683b SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 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 13807 BLAKE2B 81a4c49867b6f06b3d3c8ca9fb225e8f7b5b9c9ee922f021d30ae5d369c62f5617d543eae74dd1909372fa40f05ecf295e36fb4e9806e536f08faceb86bbd31f SHA512 97231b01be29dbe23120d56ffb34a52817326ec05d95cc336599731e19841e01bd655afc91a370ff40211e296a16e63f70aec5118a9b94e0632cbd7d10cdc599 +EBUILD icedtea-3.7.0.ebuild 14057 BLAKE2B 340edca46ea2635ef4099035583a833a2b280f3c19c4d238af3a015287dbb33a1a39b7bcf9c7fafea971df2c6e24594b6f8ac11bad894e15dc27e01e5e565bdd SHA512 7d8534c2c593ed1da2c23eeab353a46aca723d067b4b74c076ce99dd5d9e1bab9b640284b6c478a0709a410ffb3b5ba679cfd1ef81c75fa871eafc02223aad67 EBUILD icedtea-7.2.6.9.ebuild 12085 BLAKE2B c392b85759817efe9f53de6eea1051f8b3e9d3671d1b5cc558cb2449830be7e1c53c39ba8a360757dbcf3e43ada82aeb51b56e3bb9e925bbadb406ee965d02f5 SHA512 86643a8bfb678efef4feaad2a9103e64947914d80c2fa14d4fb43ce66a562e0756b64db3d72413e23aa420fa4cf8408b51e51a9928d3a5522b216f09ee4de916 diff --git a/dev-java/icedtea/files/icedtea8-hotspot-stop-using-obsolete-isnanf.patch b/dev-java/icedtea/files/icedtea8-hotspot-stop-using-obsolete-isnanf.patch new file mode 100644 index 0000000..25f0ae1 --- /dev/null +++ b/dev-java/icedtea/files/icedtea8-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 +--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp ++++ openjdk/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/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild index cb4d408..7fc7583 100644 --- a/dev-java/icedtea/icedtea-3.7.0.ebuild +++ b/dev-java/icedtea/icedtea-3.7.0.ebuild @@ -185,12 +185,13 @@ src_unpack() { src_prepare() { ln -s "${FILESDIR}/${PN}-hotspot-musl.patch" patches || die - ln -s "${FILESDIR}/${PN}8-hotspot-noagent-musl.patch" patches || die - ln -s "${FILESDIR}/${PN}8-jdk-execinfo.patch" patches || die - ln -s "${FILESDIR}/${PN}8-jdk-fix-libjvm-load.patch" patches || die - ln -s "${FILESDIR}/${PN}8-jdk-musl.patch" patches || die - ln -s "${FILESDIR}/${PN}8-autoconf-config.patch" patches || die - ln -s "${FILESDIR}/${PN}8-gcc-triple.patch" patches || die + ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-noagent-musl.patch" patches || die + ln -s "${FILESDIR}/${PN}${SLOT}-jdk-execinfo.patch" patches || die + ln -s "${FILESDIR}/${PN}${SLOT}-jdk-fix-libjvm-load.patch" patches || die + ln -s "${FILESDIR}/${PN}${SLOT}-jdk-musl.patch" patches || die + ln -s "${FILESDIR}/${PN}${SLOT}-autoconf-config.patch" patches || die + ln -s "${FILESDIR}/${PN}${SLOT}-gcc-triple.patch" patches || die + ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-stop-using-obsolete-isnanf.patch" patches || die eapply "${FILESDIR}/${PN}8-disable-systemtap.patch" eapply_user @@ -210,12 +211,13 @@ src_configure() { DISTRIBUTION_PATCHES="" DISTRIBUTION_PATCHES+="patches/${PN}-hotspot-musl.patch " - DISTRIBUTION_PATCHES+="patches/${PN}8-hotspot-noagent-musl.patch " - DISTRIBUTION_PATCHES+="patches/${PN}8-jdk-execinfo.patch " - DISTRIBUTION_PATCHES+="patches/${PN}8-jdk-fix-libjvm-load.patch " - DISTRIBUTION_PATCHES+="patches/${PN}8-jdk-musl.patch " - DISTRIBUTION_PATCHES+="patches/${PN}8-autoconf-config.patch " - DISTRIBUTION_PATCHES+="patches/${PN}8-gcc-triple.patch " + DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-noagent-musl.patch " + DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-execinfo.patch " + DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-fix-libjvm-load.patch " + DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-musl.patch " + DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-autoconf-config.patch " + DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-gcc-triple.patch " + DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-stop-using-obsolete-isnanf.patch " export DISTRIBUTION_PATCHES