Lucius-Q-User
/
gentoo-bootstrap
forked from andrius/gentoo-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

icedtea: Swap order of icedtea dependencies in icedtea:8.

This commit is contained in:
Andrius Štikonas 2022-01-03 18:40:26 +00:00
parent 3b13982602
commit 1b96623ba1
4 changed files with 34 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev-java/icedtea/Manifest
View File

@ -1,4 +1,5 @@
AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
AUX icedtea-hotspot-musl.patch 1820 BLAKE2B b3abc9dbdc17cee37452b1bdc4fb59e67da43ec6cf79268982548cf65f627d6ccb230e80c42b139cdb200071e553068fcb06df3a92c2c1237f8804bec2e612f4 SHA512 b2afd83433e205b5e183f39b65b5c3ad9583056363b44f68616d4abb3f003a7f26080da7e104e5bf95c570da84eea4b4b2054b5de1d2185ffd0d9fb5c22b5cc2
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
@ -8,7 +9,6 @@ AUX icedtea-os_linux-remove-glibc-dependencies.patch 2954 BLAKE2B 0983be4b18a5a2
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
AUX icedtea7-jdk-fcommon.patch 389 BLAKE2B 9e8936c9843b3c5e04b56268a5bc84a6213b0fbb594def7869d9e4ae1820e57b1cc8c4e4a60d3bb3c371bc241a44c409289eb5d6f3dd2edd9bf9ebbd9dcd5f32 SHA512 6fdc7dcdfd5d0c11e180ea5cbff3fad287c0dd5866ecf3aed3e271e343f78d4cfb3fd656c146fec72fd6e5e43d98961f34c53111c9407bf17fbdff18215e7d39
AUX icedtea7-jdk-freetype.patch 461 BLAKE2B 4554b7a497aadba6ac5741a076c964c6830819d61fbea9380ddc4a57dca69173e44802b0e329ea0e2e8b8708df9ac75aac1bf2c3c3bd86102ce8974dc5ce800b SHA512 90a396ee1837a1f5c21fe5165c4f9b134a785c448d5d5f31ad22fd37ff46c8147b6c549a1b0deaab69b70804b583940bfbdb547d4fd076233a18ad8a24156ce9
@ -57,6 +57,6 @@ 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.21.0.ebuild 12495 BLAKE2B 9b25c66cc66aacb2e6a8a3dc92b2d1df5d6cda6247648c3a6b7b929700cdf2193c6b5660a5862c0099775129fa0b40387405359ed29b98f6c82ee01b38e0d675 SHA512 567dc63b38c805356cc80ffed52b9efab18f44496bd05cf1f77c5d344d97870a284ae2c456b7a5394f8b0b014a65447f8739bc5a094f181e8b52c9a447dc433b
EBUILD icedtea-3.21.0.ebuild 13602 BLAKE2B f65b1da631d616091114b778affbf20f02bff098731626f7174302c3596fa3b543c8d7dddb84823adfeb016567c275fb9a0d32758156f2eb6019008d1fecf972 SHA512 10dafd039a3bd817ade8a5250574366e2f681f9242fbd19636b921a74b05d5646cf9a9c213a5ac65862da9c90277e75a13f63cfa45e996bc542c61335afe3f00
EBUILD icedtea-3.7.0.ebuild 14522 BLAKE2B 67872be030e059978f9468a8a7c1af8a3d92de36bee2ac4a11d5005e3e18e85bfddf2f1677cbf0ba361550c84e06c2e251b036f8e778cc001fb74ad098321842 SHA512 5e6748a821825f9fe29f0d6e0b2199f2cb253f664bc22c9b1dc9493a3dc234283110ca7c35cb1f8628f2e04871bc029dc6ed34b3da1cf37f994ec712a462c808
EBUILD icedtea-7.2.6.9.ebuild 13468 BLAKE2B bf30209038db55e13c784f24aa17a906bf618a4a93629c2d76680164068ad7faaa04c1ac0c2dae2d464725fde0ffccd1ef234a9d8d95acc9a1025c515e9ec038 SHA512 6bfd1d0294aac153507c054c7df2de1543d58f2eb409a83d9d5892b36ea0b1a7e68fe440e4aca108c06e2ac5fb63d1affebcf54bf24404eea07e7c562e145a26
EBUILD icedtea-7.2.6.9.ebuild 13454 BLAKE2B 70c1627015ca824e65efd522efb405d2f762ea33960972205ea315a20a54ec855f3195e4d380cedde51e209c219e99b3e163ff98706aadc2cfaa139b946cf164 SHA512 24d7aa03efb6f924c35106f59d434e051208e0aaa81ecca9d1d3251020fc22dd11af6eda95dd69a50b0386bda35261f429de68250c83d8e0b2705412d946594b

55
dev-java/icedtea/files/icedtea7-hotspot-musl.patch
View File

@ -1,55 +0,0 @@
--- openjdk.orig/hotspot/src/os/linux/vm/jvm_linux.cpp
+++ openjdk/hotspot/src/os/linux/vm/jvm_linux.cpp
@@ -154,7 +154,9 @@
#ifdef SIGSTKFLT
"STKFLT", SIGSTKFLT, /* Stack fault. */
#endif
+#ifdef SIGCLD
"CLD", SIGCLD, /* Same as SIGCHLD (System V). */
+#endif
"CHLD", SIGCHLD, /* Child status has changed (POSIX). */
"CONT", SIGCONT, /* Continue (POSIX). */
"STOP", SIGSTOP, /* Stop, unblockable (POSIX). */
--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -73,7 +73,6 @@
# include <pwd.h>
# include <poll.h>
# include <ucontext.h>
-# include <fpu_control.h>
#ifdef AMD64
#define REG_SP REG_RSP
@@ -532,6 +531,9 @@
ShouldNotReachHere();
}
+
+#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw))
+#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw))
void os::Linux::init_thread_fpu_state(void) {
#ifndef AMD64
--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp
@@ -32,7 +32,9 @@
// map stack pointer to thread pointer - see notes in threadLS_linux_x86.cpp
#define SP_BITLENGTH 32
#define PAGE_SHIFT 12
+ #ifndef PAGE_SIZE
#define PAGE_SIZE (1UL << PAGE_SHIFT)
+ #endif
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
public:
--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
@@ -75,7 +75,7 @@
# include <pwd.h>
# include <poll.h>
# include <ucontext.h>
-# include <fpu_control.h>
+# include <linux/types.h> /* provides __u64 */
#ifdef BUILTIN_SIM
#define REG_SP REG_RSP

35
dev-java/icedtea/icedtea-3.21.0.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@ -10,7 +10,7 @@
EAPI=6
SLOT="8"
inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils
inherit autotools check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs xdg-utils
ICEDTEA_VER=$(ver_cut 1-3)
ICEDTEA_BRANCH=$(ver_cut 1-2)
@ -100,7 +100,6 @@ X_DEPEND="
# 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
@ -137,8 +136,8 @@ RDEPEND="${COMMON_DEP}
# 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/icedtea:${SLOT}
dev-java/icedtea:$((SLOT-1))
dev-java/icedtea:${SLOT}
)
app-arch/cpio
app-arch/unzip
@ -187,6 +186,12 @@ src_unpack() {
unpack ${SRC_PKG}
}
src_prepare() {
eapply "${FILESDIR}/${PN}${SLOT}-disable-systemtap.patch"
eapply_user
eautoreconf
}
src_configure() {
# GCC10/-fno-common handling, #723102
if [[ $(gcc-major-version) -ge 10 ]]; then
@ -200,8 +205,26 @@ src_configure() {
mkdir -v gentoo_patches || die
cp -v "${FILESDIR}/openjdk-8-hotspot-arrayallocator.patch" gentoo_patches || die
cp -v "${FILESDIR}/openjdk-8-jdk-revert-improve-stub-classes.patch" gentoo_patches || die
export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-hotspot-arrayallocator.patch"
export DISTRIBUTION_PATCHES="gentoo_patches//openjdk-8-jdk-revert-improve-stub-classes.patch"
cp -v "${FILESDIR}/${PN}${SLOT}-jdk-execinfo.patch" gentoo_patches || die
cp -v "${FILESDIR}/${PN}${SLOT}-jdk-fix-libjvm-load.patch" gentoo_patches || die
cp -v "${FILESDIR}/${PN}${SLOT}-autoconf-config.patch" gentoo_patches || die
cp -v "${FILESDIR}/${PN}-hotspot-stop-using-obsolete-isnanf.patch" gentoo_patches || die
cp -v "${FILESDIR}/${PN}-os_linux-remove-glibc-dependencies.patch" gentoo_patches || die
cp -v "${FILESDIR}/${PN}${SLOT}-hotspot-pointer-comparison.patch" gentoo_patches || die
DISTRIBUTION_PATCHES="gentoo_patches/openjdk-8-hotspot-arrayallocator.patch "
DISTRIBUTION_PATCHES+="gentoo_patches/openjdk-8-jdk-revert-improve-stub-classes.patch "
DISTRIBUTION_PATCHES+="gentoo_patches/${PN}${SLOT}-jdk-execinfo.patch "
DISTRIBUTION_PATCHES+="gentoo_patches/${PN}${SLOT}-jdk-fix-libjvm-load.patch "
DISTRIBUTION_PATCHES+="gentoo_patches/${PN}${SLOT}-autoconf-config.patch "
DISTRIBUTION_PATCHES+="gentoo_patches/${PN}-hotspot-stop-using-obsolete-isnanf.patch "
DISTRIBUTION_PATCHES+="gentoo_patches/${PN}-os_linux-remove-glibc-dependencies.patch "
DISTRIBUTION_PATCHES+="gentoo_patches/${PN}${SLOT}-hotspot-pointer-comparison.patch "
export DISTRIBUTION_PATCHES
# For bootstrap builds as the sandbox control file might not yet exist.
addpredict /proc/self/coredump_filter #nowarn

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

@ -178,7 +178,7 @@ src_unpack() {
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-pointer-comparison.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-jdk-fcommon.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-miscompile.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-hotspot-musl.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}-hotspot-musl.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}-os_linux-remove-glibc-dependencies.patch" "${S}/patches" || die
}
@ -219,7 +219,7 @@ src_configure() {
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-fcommon.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-pointer-comparison.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-miscompile.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-hotspot-musl.patch "
DISTRIBUTION_PATCHES+="patches/${PN}-hotspot-musl.patch "
DISTRIBUTION_PATCHES+="patches/${PN}-os_linux-remove-glibc-dependencies.patch "
export DISTRIBUTION_PATCHES