1 |
commit: b2e262024d4c564b29a7da88732e2c422234549e |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 4 21:44:55 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 4 21:58:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e26202 |
7 |
|
8 |
dev-java/openjdk: drop old |
9 |
|
10 |
Bug: https://bugs.gentoo.org/732624 |
11 |
Closes: https://bugs.gentoo.org/734320 |
12 |
Closes: https://bugs.gentoo.org/706012 |
13 |
Closes: https://bugs.gentoo.org/713180 |
14 |
Closes: https://bugs.gentoo.org/706638 |
15 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
16 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
17 |
|
18 |
dev-java/openjdk/Manifest | 17 -- |
19 |
.../openjdk/files/openjdk-11.0.7_p10-sigsegv.patch | 55 ---- |
20 |
.../openjdk/files/openjdk-8-detect-gcc10.patch | 49 ---- |
21 |
dev-java/openjdk/openjdk-11.0.7_p10.ebuild | 280 --------------------- |
22 |
dev-java/openjdk/openjdk-8.252_p09.ebuild | 231 ----------------- |
23 |
dev-java/openjdk/openjdk-8.262_p10.ebuild | 226 ----------------- |
24 |
6 files changed, 858 deletions(-) |
25 |
|
26 |
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest |
27 |
index c3e413b9dd0..e5d12e87686 100644 |
28 |
--- a/dev-java/openjdk/Manifest |
29 |
+++ b/dev-java/openjdk/Manifest |
30 |
@@ -1,26 +1,9 @@ |
31 |
-DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12 |
32 |
DIST openjdk-11.0.8_p10.tar.bz2 91141175 BLAKE2B eeef0f6b6a8f804e043cde01de256c86ed35d5a391588100caea49c8c2b617c3f06aa37df894feaa89734e68c32fe28d8bc5337755050c457d657cf88fcff7f3 SHA512 f8fd26a11cb044197d3b04a1347e27e177e79cb58436e67116f63025a2a5c39c0083ac17362e7d2234caf89df530422ead088e3fc4546f8d9f68482fc75eb7a0 |
33 |
-DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06 |
34 |
-DIST openjdk-8.262_p10.tar.bz2 455868 BLAKE2B 22637a8ecd2af97b8cdc335fff5d4a14c56f53a26f0fe1ccb61f7f6542961126f4a2dadfc596ae561ea27cfdbc5f23fb10350d1533f43f1740540367565cb160 SHA512 196e201cbbd53132a78f276df7407346ba611798d813272c68cd3d654f34b84874009cda1df62e51fd5e33c5bc4aa4bdda6bd0ef7cac9857c609fcdb3fa3fd53 |
35 |
DIST openjdk-8.265_p01.tar.bz2 456095 BLAKE2B 8de4d0293f3062583654da99a29d5be02197c323772f663d37ab21bdfdf32a723412d301094e6f70cbba99883241f52406a799a91c3d7c2a69ab7b35932c0a38 SHA512 686b869f9278462c6cb52036c4c9261e1689b917ce0afd4e6b47bb3d3207b2e79b2d03c2d3808a5853ab2fa070ac2206877849f5837282cb6deb80f610ba67f5 |
36 |
-DIST openjdk-corba-8.252_p09.tar.bz2 1034367 BLAKE2B d281a0b2e092c637adae4a206ac4b3f7beeb65f0fce5862f996ac71a814c5c3ee3261dd1145660cb50fde0398e42ca1e8c86d6aad07e43b44aa1f903c204b21c SHA512 08f348849eeadefee3dce9658b519091a14b9f972a1ee1dc51c37a3cd766e5265faed1931b967410ebff2132dd18cedf8840277d804b402ee43a862e37575ab1 |
37 |
-DIST openjdk-corba-8.262_p10.tar.bz2 1033428 BLAKE2B 979f86546dc4c558c8615e4cc1887bcc4a0b82845cf6474ef3802321cb205037c2c753c55f0c219cba3e0771bc2e1a7096b6ad93ce8582e45ef6b5815c0c593b SHA512 4b91cbcc55b983719aa1e0fb683bf2d169b908eb4d4e24857dfd918f4f086e6ce1317f980ba89ff911673131c71c27149091ee114deb75e6f98f31b0922bc04f |
38 |
DIST openjdk-corba-8.265_p01.tar.bz2 1034140 BLAKE2B 4b176bf2d9ff461b5682ad7f4b994091acf017df2caabf292dcda9baa34abd7d8016f56f2aff0866508eac565f4079e6f8ba8cbd8167abf1e38cd1fac727e141 SHA512 d92b69ab33176c29c5b7c0a5a21947d5d28dafa32a5933414bea5d16d4e68e1a381b2a73114952d507e7ee76c132e70dc8234175edfd3a086c4775417eaa7d9a |
39 |
-DIST openjdk-hotspot-8.252_p09.tar.bz2 7954548 BLAKE2B a791d3c3385be3c8543bea1fc8d5bee9b3de873122ec850c3ad0082430083ec9dff2aa7c0cae33e628047a18a76fca8146b68aa52f32845cf7a61a45fdc8d9eb SHA512 53079cc255f75f246a67937bdf2b7715882f9baf8bcbc46ab2963c259359b1008642aeeae7ba7705c39f7a04e69ba286421a83b90294e81071f8e630db48ba7c |
40 |
-DIST openjdk-hotspot-8.262_p10.tar.bz2 8204485 BLAKE2B dd4411fdceb36c378d15fce45dc75ea6b2e19c219a6b46e10de3864407d9eff0a4fcb7fcf2f5f0bc613b68cd54766404f25c76346c7500e7a2018c0001ad4981 SHA512 11880562cebbdc4abd59cd2ac234ca697316c1ec78ad291fa41d69fe8f5f01f30db0c3e224226521afcaf798619a5afc9055ea12fcd41f5da179a353351dff2a |
41 |
DIST openjdk-hotspot-8.265_p01.tar.bz2 8204133 BLAKE2B 3c574da38c9c787e2b40dafa6d7885f9632804a158de26fb4e6f9b5266c955adad8adb1917043eecba97fbb1e53c063da08231e806f5ba8f6c0ef762e88c45b6 SHA512 a3fbc527456aeb8566db24f910e6a64f976e3434fe3717058ee91e66e88d03d77641d342801002f7fa35fb8bb94ce397c95ac2abb86c0616ff25f167878b478b |
42 |
-DIST openjdk-jaxp-8.252_p09.tar.bz2 2736174 BLAKE2B c198f144be7d0e7439e2184768db8649973f9e6869e67d3a950abd4872584160f4aaec1f4bec727f0d38830d34a4be7bd2f3e897b8ca10c758212262fa1672c3 SHA512 8027676e2928087a7d396c4f1edd3366336aaf8e3f201e2006cb7ddf91e518c9258d7ab6cc1c4fcc27e3e87bcecd96c55b2550d49f28b98beabf7553ea54ba3f |
43 |
-DIST openjdk-jaxp-8.262_p10.tar.bz2 2735942 BLAKE2B 0445bffe29772968775d4ef5c516e16e53564a27828487ac69224591f008659548bf561eb5e8ac90d1c6129c52e5b91da142b66eb3c4117504752d8a151202ba SHA512 6ff35eaf23a21376643252a0cdcf7d82588c49f9e231e069b14c930d0379f1ef5973996918ae964729d2038d677f2afeec094af904df7e294c3c81a09f12c0b1 |
44 |
DIST openjdk-jaxp-8.265_p01.tar.bz2 2735823 BLAKE2B 84a1248b4eb56f4afff62c5dc0f3517c98a6dc5c7e434012c667d59f05a1719372f68594d9d6b13c04e98887913a01b05eefcdadb3a028275555b2a9720502ba SHA512 d0f9da699d4141fa5535abbdf244b4da0fd466b8b5eca3fcaa7cc739326d79a5aa5ffac90988f8bedb39f80d7d4f1feaac3cf5fb1b019203cc96eae9746d9bbc |
45 |
-DIST openjdk-jaxws-8.252_p09.tar.bz2 2542417 BLAKE2B cf898e0c56269ea1f468c6b9e6cfbdf552caea562f833ade234d207f05be6f39f86d9d6794cc8b365ed3fde4bac5df41949e76cbaef61553f5557ec86dd593e6 SHA512 cadeec8825073db1fea13f1d83903ba2799324cfa8e25012c5dc98ec31976bd91b22526f98fc871d0ee01156943f4fc4ec115f7a81feb10e9f7d96f3f39a9313 |
46 |
-DIST openjdk-jaxws-8.262_p10.tar.bz2 2543114 BLAKE2B 1329a7157335374e6a61572843c067fbb8125ccdc425ce54a5fc723750d2efdde255390393dfbdb3993fe21943bc9c18bb0aa22a177d7095bbe1343cd4fed1b4 SHA512 d229dea6d1feb0f404f438e8e2fe7760866965db3d0dfe2c3be52122723a915b502114716b99a243029f4377ea701918568dfe7a8426922e7186addb2ea9a36a |
47 |
DIST openjdk-jaxws-8.265_p01.tar.bz2 2543597 BLAKE2B c83256ab68837cc44d65414343d4bfa7d908926b1a092416cb16551593ed58eb4e28333a6e0417fdad7426ea2b648cffe9e8ef9531f76b7ff9a29851cb27918b SHA512 3a23ae92cbc1f5f47a1f2dffaaef1999acc34125176f67139040f17c3b6fe4cf78ee8c506a73c8fd38ddbb59bfb22c61f2e45ebf8739be7eb7df83cc65303433 |
48 |
-DIST openjdk-jdk-8.252_p09.tar.bz2 47507382 BLAKE2B 4638256df52aa48a1ccace15fe65b284cb2a1e3a3c45f32ae69a807ae4bd9b9ce3cf9f464a9b8a87d07c49f2d7c48c8516b43d9d4372f578ad1cd4dfa17abb80 SHA512 96188acc8078c312c7118abfbc39874429f71e63c2e282fef2da9df29731ee13396bda28a8a1041b17b50da4bb00b1fe88404d682b0a850e5db10e59e39994f2 |
49 |
-DIST openjdk-jdk-8.262_p10.tar.bz2 48030557 BLAKE2B 5aba38969729686718527acbf469086afc241c65667a69ddd2a71af4250dd2d931ea267a0c956a1ab342eea032a981ff66a31875f3d7ccca9dcdff82e02df10e SHA512 120b0f613ed9b13c07e68cfc074a1d812567edbc209cbc14d15b477fb7e67a779139f620bc7c65423e420c7b240211727760ca69b532d2f009452f7bfbecacd4 |
50 |
DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f762e3517bda2bf6849af758285b7ea61cc57d89290ec47538b1082eea99646d3dd6295b98ad65edd62d1b1fd2480c0928a74 SHA512 44ad75bf3b3c6fd6b782ee5383edfa60fb49ac2e40493b18487bcb8a4dac926ffcf5b663adbb8d3267021bd47d5b60652771a88257fbaff77aa2e1f627252418 |
51 |
-DIST openjdk-langtools-8.252_p09.tar.bz2 2399354 BLAKE2B aa3f0cb647986490612b9574fb0c78955f5ffb8969dbd06dfae5406436d6fecdbbb09896bdb0acc18d56f51bcd4ad1eadb19cc544185762ad623a47fde2e4a85 SHA512 d84ff97294ac612cd4e49deb2d7470026a564208c0e1fa23d5692db45efaaf564483966921ce642506a97aa90a2a8593617f944ebc6d18c9db5a808fd3946864 |
52 |
-DIST openjdk-langtools-8.262_p10.tar.bz2 2398186 BLAKE2B 874461ecd6655edab66541ca681e60eb1f0dd3331d26ad806f59c486658fb7cdf26a65869316ae7e1ba04aa1a4b45f1bc2848b695e89a87b878f399b08b12bb4 SHA512 a109d8dd94c83b0caddd1527c2467c12f05c344c1916a5af7bac0127a5694107d6a902679bf609a48aad434b3c623d42cce6ece83b205051435d3e3aab1824f7 |
53 |
DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6 |
54 |
-DIST openjdk-nashorn-8.252_p09.tar.bz2 2852104 BLAKE2B 570fbe605ed27c4b3a5db5f6e9dbb4269ad2c895654a989d366a4a6f238ea06fec398140563ca2700303856dfa795ae40dbf9485dd9e9a46ef438f5418fd8b8b SHA512 996e7068d8c6f8ca192e6037eaf7f98ff94188c02670caadf1042e4e0909a3d51835a8cd2250d1f0a8bbdedb107f3713b614466ba4d2915b955e19fdcc2cbb91 |
55 |
-DIST openjdk-nashorn-8.262_p10.tar.bz2 2852351 BLAKE2B f7c4650981e6193f5e7495971b1a1777e086d734befe79ef53bc20382cc738f14ea95e6bd1baa51e128a071c96ca3885eac93494fe1db92de4eb2820f1392ebd SHA512 55119e12a7dc2f1acc31c655f5b3fb9f417b06310c99d4e93c355bd638950f839e62137509f784dafd7f402940dddefc4c0952a5e182d4801f46d78830086e97 |
56 |
DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e |
57 |
|
58 |
diff --git a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch b/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch |
59 |
deleted file mode 100644 |
60 |
index 04c61c06589..00000000000 |
61 |
--- a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch |
62 |
+++ /dev/null |
63 |
@@ -1,55 +0,0 @@ |
64 |
- |
65 |
-# HG changeset patch |
66 |
-# User ccheung |
67 |
-# Date 1564075552 25200 |
68 |
-# Node ID f1332f6025515e4fc9e42fbf79f983d782abaaf0 |
69 |
-# Parent 966fc6d784a737ec25cd0b1be48109a4a3fa02ad |
70 |
-8228407: JVM crashes with shared archive file mismatch |
71 |
-Summary: Stop processing other header fields if initial header check has failed. |
72 |
-Reviewed-by: dholmes, jiangli |
73 |
- |
74 |
-diff -r 966fc6d784a7 -r f1332f602551 src/hotspot/share/memory/filemap.cpp |
75 |
---- a/src/hotspot/share/memory/filemap.cpp Mon Mar 02 12:30:59 2020 +0100 |
76 |
-+++ b/src/hotspot/share/memory/filemap.cpp Thu Jul 25 10:25:52 2019 -0700 |
77 |
-@@ -1287,7 +1287,9 @@ |
78 |
- } |
79 |
- |
80 |
- init_from_file(_fd); |
81 |
-- if (!validate_header()) { |
82 |
-+ // UseSharedSpaces could be disabled if the checking of some of the header fields in |
83 |
-+ // init_from_file has failed. |
84 |
-+ if (!UseSharedSpaces || !validate_header()) { |
85 |
- return false; |
86 |
- } |
87 |
- return true; |
88 |
-diff -r 966fc6d784a7 -r f1332f602551 test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java |
89 |
---- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Mon Mar 02 12:30:59 2020 +0100 |
90 |
-+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Thu Jul 25 10:25:52 2019 -0700 |
91 |
-@@ -385,8 +385,16 @@ |
92 |
- output.shouldNotContain("Checksum verification failed"); |
93 |
- |
94 |
- copyFile(orgJsaFile, jsa); |
95 |
-+ // modify _jvm_ident and run with -Xshare:auto |
96 |
-+ System.out.println("\n2b. Corrupt _jvm_ident run with -Xshare:auto\n"); |
97 |
-+ modifyJvmIdent(); |
98 |
-+ output = TestCommon.execAuto(execArgs); |
99 |
-+ output.shouldContain("The shared archive file was created by a different version or build of HotSpot"); |
100 |
-+ output.shouldContain("Hello World"); |
101 |
-+ |
102 |
-+ copyFile(orgJsaFile, jsa); |
103 |
- // modify _magic and _paths_misc_info_size, test should fail |
104 |
-- System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size, should fail\n"); |
105 |
-+ System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size, should fail\n"); |
106 |
- modifyHeaderIntField(offset_magic, 0x00000000); |
107 |
- modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE); |
108 |
- output = TestCommon.execCommon(execArgs); |
109 |
-@@ -395,7 +403,7 @@ |
110 |
- |
111 |
- copyFile(orgJsaFile, jsa); |
112 |
- // modify _version and _paths_misc_info_size, test should fail |
113 |
-- System.out.println("\n2c. Corrupt _version and _paths_misc_info_size, should fail\n"); |
114 |
-+ System.out.println("\n2d. Corrupt _version and _paths_misc_info_size, should fail\n"); |
115 |
- modifyHeaderIntField(offset_version, 0x00000000); |
116 |
- modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE); |
117 |
- output = TestCommon.execCommon(execArgs); |
118 |
- |
119 |
|
120 |
diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch |
121 |
deleted file mode 100644 |
122 |
index b47e012d4a3..00000000000 |
123 |
--- a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch |
124 |
+++ /dev/null |
125 |
@@ -1,49 +0,0 @@ |
126 |
-From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001 |
127 |
-From: Georgy Yakovlev <gyakovlev@g.o> |
128 |
-Date: Sat, 23 May 2020 20:48:10 -0700 |
129 |
-Subject: [PATCH] backport gcc10 fix |
130 |
- |
131 |
-https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0 |
132 |
---- |
133 |
- common/autoconf/generated-configure.sh | 4 ++-- |
134 |
- common/autoconf/toolchain.m4 | 2 +- |
135 |
- 2 files changed, 3 insertions(+), 3 deletions(-) |
136 |
- |
137 |
-diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh |
138 |
-index 5e71c50..90c017d 100644 |
139 |
---- a/common/autoconf/generated-configure.sh |
140 |
-+++ b/common/autoconf/generated-configure.sh |
141 |
-@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO |
142 |
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
143 |
- $SED -e 's/ *Copyright .*//'` |
144 |
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
145 |
-- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` |
146 |
-+ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` |
147 |
- elif test "x$TOOLCHAIN_TYPE" = xclang; then |
148 |
- # clang --version output typically looks like |
149 |
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
150 |
-@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO |
151 |
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
152 |
- $SED -e 's/ *Copyright .*//'` |
153 |
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
154 |
-- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'` |
155 |
-+ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'` |
156 |
- elif test "x$TOOLCHAIN_TYPE" = xclang; then |
157 |
- # clang --version output typically looks like |
158 |
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
159 |
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 |
160 |
-index e3a82c8..c0a4af5 100644 |
161 |
---- a/common/autoconf/toolchain.m4 |
162 |
-+++ b/common/autoconf/toolchain.m4 |
163 |
-@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], |
164 |
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
165 |
- $SED -e 's/ *Copyright .*//'` |
166 |
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
167 |
-- $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'` |
168 |
-+ $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'` |
169 |
- elif test "x$TOOLCHAIN_TYPE" = xclang; then |
170 |
- # clang --version output typically looks like |
171 |
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
172 |
--- |
173 |
-2.26.2 |
174 |
- |
175 |
|
176 |
diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild |
177 |
deleted file mode 100644 |
178 |
index b5d448dd9e8..00000000000 |
179 |
--- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild |
180 |
+++ /dev/null |
181 |
@@ -1,280 +0,0 @@ |
182 |
-# Copyright 1999-2020 Gentoo Authors |
183 |
-# Distributed under the terms of the GNU General Public License v2 |
184 |
- |
185 |
-EAPI=6 |
186 |
- |
187 |
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs |
188 |
- |
189 |
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to |
190 |
-# set build version properly |
191 |
-MY_PV="${PV%_p*}-ga" |
192 |
-SLOT="${MY_PV%%[.+]*}" |
193 |
- |
194 |
-DESCRIPTION="Open source implementation of the Java programming language" |
195 |
-HOMEPAGE="https://openjdk.java.net" |
196 |
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2" |
197 |
- |
198 |
-LICENSE="GPL-2" |
199 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
200 |
- |
201 |
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" |
202 |
- |
203 |
-COMMON_DEPEND=" |
204 |
- media-libs/freetype:2= |
205 |
- media-libs/giflib:0/7 |
206 |
- media-libs/libpng:0= |
207 |
- media-libs/lcms:2= |
208 |
- sys-libs/zlib |
209 |
- virtual/jpeg:0= |
210 |
- systemtap? ( dev-util/systemtap ) |
211 |
-" |
212 |
- |
213 |
-# Many libs are required to build, but not to run, make is possible to remove |
214 |
-# by listing conditionally in RDEPEND unconditionally in DEPEND |
215 |
-RDEPEND=" |
216 |
- ${COMMON_DEPEND} |
217 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
218 |
- !headless-awt? ( |
219 |
- x11-libs/libX11 |
220 |
- x11-libs/libXext |
221 |
- x11-libs/libXi |
222 |
- x11-libs/libXrandr |
223 |
- x11-libs/libXrender |
224 |
- x11-libs/libXt |
225 |
- x11-libs/libXtst |
226 |
- ) |
227 |
- alsa? ( media-libs/alsa-lib ) |
228 |
- cups? ( net-print/cups ) |
229 |
- selinux? ( sec-policy/selinux-java ) |
230 |
-" |
231 |
- |
232 |
-DEPEND=" |
233 |
- ${COMMON_DEPEND} |
234 |
- app-arch/zip |
235 |
- media-libs/alsa-lib |
236 |
- net-print/cups |
237 |
- x11-base/xorg-proto |
238 |
- x11-libs/libX11 |
239 |
- x11-libs/libXext |
240 |
- x11-libs/libXi |
241 |
- x11-libs/libXrandr |
242 |
- x11-libs/libXrender |
243 |
- x11-libs/libXt |
244 |
- x11-libs/libXtst |
245 |
- javafx? ( dev-java/openjfx:${SLOT}= ) |
246 |
- || ( |
247 |
- dev-java/openjdk-bin:${SLOT} |
248 |
- dev-java/openjdk:${SLOT} |
249 |
- ) |
250 |
-" |
251 |
- |
252 |
-PDEPEND=" |
253 |
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
254 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
255 |
-" |
256 |
- |
257 |
-REQUIRED_USE="javafx? ( alsa !headless-awt )" |
258 |
- |
259 |
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" |
260 |
- |
261 |
-PATCHES=( |
262 |
- "${FILESDIR}/${P}-sigsegv.patch" |
263 |
-) |
264 |
- |
265 |
-# The space required to build varies wildly depending on USE flags, |
266 |
-# ranging from 2GB to 16GB. This function is certainly not exact but |
267 |
-# should be close enough to be useful. |
268 |
-openjdk_check_requirements() { |
269 |
- local M |
270 |
- M=2048 |
271 |
- M=$(( $(usex jbootstrap 2 1) * $M )) |
272 |
- M=$(( $(usex debug 3 1) * $M )) |
273 |
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) |
274 |
- |
275 |
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} |
276 |
-} |
277 |
- |
278 |
-pkg_pretend() { |
279 |
- openjdk_check_requirements |
280 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
281 |
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
282 |
- fi |
283 |
-} |
284 |
- |
285 |
-pkg_setup() { |
286 |
- openjdk_check_requirements |
287 |
- java-vm-2_pkg_setup |
288 |
- |
289 |
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" |
290 |
- JAVA_PKG_WANT_SOURCE="${SLOT}" |
291 |
- JAVA_PKG_WANT_TARGET="${SLOT}" |
292 |
- |
293 |
- # The nastiness below is necessary while the gentoo-vm USE flag is |
294 |
- # masked. First we call java-pkg-2_pkg_setup if it looks like the |
295 |
- # flag was unmasked against one of the possible build VMs. If not, |
296 |
- # we try finding one of them in their expected locations. This would |
297 |
- # have been slightly less messy if openjdk-bin had been installed to |
298 |
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env |
299 |
- # file but disable it so that it would not normally be selectable. |
300 |
- |
301 |
- local vm |
302 |
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do |
303 |
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then |
304 |
- java-pkg-2_pkg_setup |
305 |
- return |
306 |
- fi |
307 |
- done |
308 |
- |
309 |
- if has_version --host-root dev-java/openjdk:${SLOT}; then |
310 |
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} |
311 |
- else |
312 |
- if [[ ${MERGE_TYPE} != "binary" ]]; then |
313 |
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) |
314 |
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!" |
315 |
- JDK_HOME=${JDK_HOME#*/} |
316 |
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} |
317 |
- export JDK_HOME |
318 |
- fi |
319 |
- fi |
320 |
-} |
321 |
- |
322 |
-src_prepare() { |
323 |
- default |
324 |
- chmod +x configure || die |
325 |
-} |
326 |
- |
327 |
-src_configure() { |
328 |
- # Work around stack alignment issue, bug #647954. in case we ever have x86 |
329 |
- use x86 && append-flags -mincoming-stack-boundary=2 |
330 |
- |
331 |
- # Work around -fno-common ( GCC10 default ), bug #713180 |
332 |
- append-flags -fcommon |
333 |
- |
334 |
- # Enabling full docs appears to break doc building. If not |
335 |
- # explicitly disabled, the flag will get auto-enabled if pandoc and |
336 |
- # graphviz are detected. pandoc has loads of dependencies anyway. |
337 |
- |
338 |
- local myconf=( |
339 |
- --disable-ccache |
340 |
- --enable-full-docs=no |
341 |
- --with-boot-jdk="${JDK_HOME}" |
342 |
- --with-extra-cflags="${CFLAGS}" |
343 |
- --with-extra-cxxflags="${CXXFLAGS}" |
344 |
- --with-extra-ldflags="${LDFLAGS}" |
345 |
- --with-giflib=system |
346 |
- --with-lcms=system |
347 |
- --with-libjpeg=system |
348 |
- --with-libpng=system |
349 |
- --with-native-debug-symbols=$(usex debug internal none) |
350 |
- --with-vendor-name="Gentoo" |
351 |
- --with-vendor-url="https://gentoo.org" |
352 |
- --with-vendor-bug-url="https://bugs.gentoo.org" |
353 |
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" |
354 |
- --with-vendor-version-string="${PVR}" |
355 |
- --with-version-pre="" |
356 |
- --with-version-string="${PV%_p*}" |
357 |
- --with-version-build="${PV#*_p}" |
358 |
- --with-zlib=system |
359 |
- --enable-dtrace=$(usex systemtap yes no) |
360 |
- --enable-headless-only=$(usex headless-awt yes no) |
361 |
- ) |
362 |
- |
363 |
- if use javafx; then |
364 |
- local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" |
365 |
- if [[ -r ${zip} ]]; then |
366 |
- myconf+=( --with-import-modules="${zip}" ) |
367 |
- else |
368 |
- die "${zip} not found or not readable" |
369 |
- fi |
370 |
- fi |
371 |
- |
372 |
- # PaX breaks pch, bug #601016 |
373 |
- if use pch && ! host-is-pax; then |
374 |
- myconf+=( --enable-precompiled-headers ) |
375 |
- else |
376 |
- myconf+=( --disable-precompiled-headers ) |
377 |
- fi |
378 |
- |
379 |
- ( |
380 |
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS |
381 |
- CFLAGS= CXXFLAGS= LDFLAGS= \ |
382 |
- CONFIG_SITE=/dev/null \ |
383 |
- econf "${myconf[@]}" |
384 |
- ) |
385 |
-} |
386 |
- |
387 |
-src_compile() { |
388 |
- local myemakeargs=( |
389 |
- JOBS=$(makeopts_jobs) |
390 |
- LOG=debug |
391 |
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror |
392 |
- $(usex doc docs '') |
393 |
- $(usex jbootstrap bootcycle-images product-images) |
394 |
- ) |
395 |
- emake "${myemakeargs[@]}" -j1 #nowarn |
396 |
-} |
397 |
- |
398 |
-src_install() { |
399 |
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}" |
400 |
- local ddest="${ED}${dest#/}" |
401 |
- |
402 |
- cd "${S}"/build/*-release/images/jdk || die |
403 |
- |
404 |
- # Create files used as storage for system preferences. |
405 |
- mkdir .systemPrefs || die |
406 |
- touch .systemPrefs/.system.lock || die |
407 |
- touch .systemPrefs/.systemRootModFile || die |
408 |
- |
409 |
- # Oracle and IcedTea have libjsoundalsa.so depending on |
410 |
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird. |
411 |
- if ! use alsa ; then |
412 |
- rm -v lib/libjsound.* || die |
413 |
- fi |
414 |
- |
415 |
- if ! use examples ; then |
416 |
- rm -vr demo/ || die |
417 |
- fi |
418 |
- |
419 |
- if ! use source ; then |
420 |
- rm -v lib/src.zip || die |
421 |
- fi |
422 |
- |
423 |
- rm -v lib/security/cacerts || die |
424 |
- |
425 |
- dodir "${dest}" |
426 |
- cp -pPR * "${ddest}" || die |
427 |
- |
428 |
- dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts |
429 |
- |
430 |
- # must be done before running itself |
431 |
- java-vm_set-pax-markings "${ddest}" |
432 |
- |
433 |
- einfo "Creating the Class Data Sharing archives and disabling usage tracking" |
434 |
- "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die |
435 |
- |
436 |
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
437 |
- java-vm_revdep-mask |
438 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
439 |
- |
440 |
- if use doc ; then |
441 |
- docinto html |
442 |
- dodoc -r "${S}"/build/*-release/images/docs/* |
443 |
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" |
444 |
- fi |
445 |
-} |
446 |
- |
447 |
-pkg_postinst() { |
448 |
- java-vm-2_pkg_postinst |
449 |
- |
450 |
- if use gentoo-vm ; then |
451 |
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" |
452 |
- ewarn "recognised by the system. This will almost certainly break" |
453 |
- ewarn "many java ebuilds as they are not ready for openjdk-11" |
454 |
- else |
455 |
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" |
456 |
- ewarn "will not be recognised by the system. For example, simply calling" |
457 |
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" |
458 |
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" |
459 |
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." |
460 |
- fi |
461 |
-} |
462 |
|
463 |
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild |
464 |
deleted file mode 100644 |
465 |
index 45c3e3cc90c..00000000000 |
466 |
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild |
467 |
+++ /dev/null |
468 |
@@ -1,231 +0,0 @@ |
469 |
-# Copyright 1999-2020 Gentoo Authors |
470 |
-# Distributed under the terms of the GNU General Public License v2 |
471 |
- |
472 |
-EAPI=6 |
473 |
- |
474 |
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs |
475 |
- |
476 |
-# we need latest -ga tag from hg, but want to keep build number as well |
477 |
-# as _p component of the gentoo version string. |
478 |
- |
479 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga) |
480 |
- |
481 |
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u" |
482 |
- |
483 |
-DESCRIPTION="Open source implementation of the Java programming language" |
484 |
-HOMEPAGE="https://openjdk.java.net" |
485 |
-SRC_URI=" |
486 |
- ${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2 |
487 |
- ${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2 |
488 |
- ${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2 |
489 |
- ${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2 |
490 |
- ${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2 |
491 |
- ${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2 |
492 |
- ${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2 |
493 |
- ${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2 |
494 |
-" |
495 |
- |
496 |
-LICENSE="GPL-2" |
497 |
-SLOT="$(ver_cut 1)" |
498 |
-KEYWORDS="amd64 ppc64 ~x86" |
499 |
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart" |
500 |
- |
501 |
-COMMON_DEPEND=" |
502 |
- media-libs/freetype:2= |
503 |
- media-libs/giflib:0/7 |
504 |
- sys-libs/zlib |
505 |
-" |
506 |
-# Many libs are required to build, but not to run, make is possible to remove |
507 |
-# by listing conditionally in RDEPEND unconditionally in DEPEND |
508 |
-RDEPEND=" |
509 |
- ${COMMON_DEPEND} |
510 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
511 |
- !headless-awt? ( |
512 |
- x11-libs/libX11 |
513 |
- x11-libs/libXext |
514 |
- x11-libs/libXi |
515 |
- x11-libs/libXrender |
516 |
- x11-libs/libXt |
517 |
- x11-libs/libXtst |
518 |
- ) |
519 |
- alsa? ( media-libs/alsa-lib ) |
520 |
- cups? ( net-print/cups ) |
521 |
- selinux? ( sec-policy/selinux-java ) |
522 |
-" |
523 |
- |
524 |
-DEPEND=" |
525 |
- ${COMMON_DEPEND} |
526 |
- app-arch/zip |
527 |
- media-libs/alsa-lib |
528 |
- net-print/cups |
529 |
- x11-base/xorg-proto |
530 |
- x11-libs/libX11 |
531 |
- x11-libs/libXext |
532 |
- x11-libs/libXi |
533 |
- x11-libs/libXrender |
534 |
- x11-libs/libXt |
535 |
- x11-libs/libXtst |
536 |
- || ( |
537 |
- dev-java/openjdk-bin:${SLOT} |
538 |
- dev-java/icedtea-bin:${SLOT} |
539 |
- dev-java/openjdk:${SLOT} |
540 |
- dev-java/icedtea:${SLOT} |
541 |
- ) |
542 |
-" |
543 |
- |
544 |
-PDEPEND=" |
545 |
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
546 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
547 |
-" |
548 |
- |
549 |
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" |
550 |
- |
551 |
-# bug 721970, JDK-8244760 |
552 |
-PATCHES=( |
553 |
- "${FILESDIR}/openjdk-8-detect-gcc10.patch" |
554 |
-) |
555 |
- |
556 |
-# The space required to build varies wildly depending on USE flags, |
557 |
-# ranging from 2GB to 16GB. This function is certainly not exact but |
558 |
-# should be close enough to be useful. |
559 |
-openjdk_check_requirements() { |
560 |
- local M |
561 |
- M=2048 |
562 |
- M=$(( $(usex debug 3 1) * $M )) |
563 |
- M=$(( $(usex jbootstrap 2 1) * $M )) |
564 |
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) |
565 |
- |
566 |
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} |
567 |
-} |
568 |
- |
569 |
-pkg_pretend() { |
570 |
- openjdk_check_requirements |
571 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
572 |
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
573 |
- fi |
574 |
-} |
575 |
- |
576 |
-pkg_setup() { |
577 |
- openjdk_check_requirements |
578 |
- |
579 |
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}" |
580 |
- JAVA_PKG_WANT_SOURCE="${SLOT}" |
581 |
- JAVA_PKG_WANT_TARGET="${SLOT}" |
582 |
- |
583 |
- java-vm-2_pkg_setup |
584 |
- java-pkg-2_pkg_setup |
585 |
-} |
586 |
- |
587 |
-src_prepare() { |
588 |
- default |
589 |
- chmod +x configure || die |
590 |
- local repo |
591 |
- for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do |
592 |
- ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die |
593 |
- done |
594 |
- # new warnings in new gcc https://bugs.gentoo.org/685426 |
595 |
- sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ |
596 |
- hotspot/make/linux/makefiles/gcc.make || die |
597 |
-} |
598 |
- |
599 |
-src_configure() { |
600 |
- # general build info found here: |
601 |
- #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html |
602 |
- |
603 |
- # Work around stack alignment issue, bug #647954. |
604 |
- use x86 && append-flags -mincoming-stack-boundary=2 |
605 |
- |
606 |
- # Work around -fno-common ( GCC10 default ), bug #706638 |
607 |
- append-flags -fcommon |
608 |
- |
609 |
- local myconf=( |
610 |
- --disable-ccache |
611 |
- --enable-unlimited-crypto |
612 |
- --with-boot-jdk="${JDK_HOME}" |
613 |
- --with-extra-cflags="${CFLAGS}" |
614 |
- --with-extra-cxxflags="${CXXFLAGS}" |
615 |
- --with-extra-ldflags="${LDFLAGS}" |
616 |
- --with-giflib=system |
617 |
- --with-jtreg=no |
618 |
- --with-jobs=1 |
619 |
- --with-num-cores=1 |
620 |
- --with-update-version="$(ver_cut 2)" |
621 |
- --with-build-number="b$(ver_cut 4)" |
622 |
- --with-milestone="fcs" # magic variable that means "release version" |
623 |
- --with-vendor-name="Gentoo" |
624 |
- --with-vendor-url="https://gentoo.org" |
625 |
- --with-vendor-bug-url="https://bugs.gentoo.org" |
626 |
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" |
627 |
- --with-zlib=system |
628 |
- --with-native-debug-symbols=$(usex debug internal none) |
629 |
- $(usex headless-awt --disable-headful '') |
630 |
- ) |
631 |
- |
632 |
- # PaX breaks pch, bug #601016 |
633 |
- if use pch && ! host-is-pax; then |
634 |
- myconf+=( --enable-precompiled-headers ) |
635 |
- else |
636 |
- myconf+=( --disable-precompiled-headers ) |
637 |
- fi |
638 |
- |
639 |
- ( |
640 |
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS |
641 |
- CFLAGS= CXXFLAGS= LDFLAGS= \ |
642 |
- CONFIG_SITE=/dev/null \ |
643 |
- econf "${myconf[@]}" |
644 |
- ) |
645 |
-} |
646 |
- |
647 |
-src_compile() { |
648 |
- local myemakeargs=( |
649 |
- JOBS=$(makeopts_jobs) |
650 |
- LOG=debug |
651 |
- $(usex doc docs '') |
652 |
- $(usex jbootstrap bootcycle-images images) |
653 |
- ) |
654 |
- emake "${myemakeargs[@]}" -j1 #nowarn |
655 |
-} |
656 |
- |
657 |
-src_install() { |
658 |
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}" |
659 |
- local ddest="${ED%/}/${dest#/}" |
660 |
- |
661 |
- cd "${S}"/build/*-release/images/j2sdk-image || die |
662 |
- |
663 |
- if ! use alsa; then |
664 |
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die |
665 |
- fi |
666 |
- |
667 |
- # stupid build system does not remove that |
668 |
- if use headless-awt ; then |
669 |
- rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ |
670 |
- {,jre/}bin/policytool bin/appletviewer || die |
671 |
- fi |
672 |
- |
673 |
- if ! use examples ; then |
674 |
- rm -vr demo/ || die |
675 |
- fi |
676 |
- |
677 |
- if ! use source ; then |
678 |
- rm -v src.zip || die |
679 |
- fi |
680 |
- |
681 |
- dodir "${dest}" |
682 |
- cp -pPR * "${ddest}" || die |
683 |
- |
684 |
- dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
685 |
- |
686 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
687 |
- java-vm_set-pax-markings "${ddest}" |
688 |
- java-vm_revdep-mask |
689 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
690 |
- |
691 |
- if use doc ; then |
692 |
- docinto html |
693 |
- dodoc -r "${S}"/build/*-release/docs/* |
694 |
- fi |
695 |
-} |
696 |
- |
697 |
-pkg_postinst() { |
698 |
- java-vm-2_pkg_postinst |
699 |
-} |
700 |
|
701 |
diff --git a/dev-java/openjdk/openjdk-8.262_p10.ebuild b/dev-java/openjdk/openjdk-8.262_p10.ebuild |
702 |
deleted file mode 100644 |
703 |
index ceee66cafae..00000000000 |
704 |
--- a/dev-java/openjdk/openjdk-8.262_p10.ebuild |
705 |
+++ /dev/null |
706 |
@@ -1,226 +0,0 @@ |
707 |
-# Copyright 1999-2020 Gentoo Authors |
708 |
-# Distributed under the terms of the GNU General Public License v2 |
709 |
- |
710 |
-EAPI=6 |
711 |
- |
712 |
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs |
713 |
- |
714 |
-# we need latest -ga tag from hg, but want to keep build number as well |
715 |
-# as _p component of the gentoo version string. |
716 |
- |
717 |
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga) |
718 |
- |
719 |
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u" |
720 |
- |
721 |
-DESCRIPTION="Open source implementation of the Java programming language" |
722 |
-HOMEPAGE="https://openjdk.java.net" |
723 |
-SRC_URI=" |
724 |
- ${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2 |
725 |
- ${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2 |
726 |
- ${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2 |
727 |
- ${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2 |
728 |
- ${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2 |
729 |
- ${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2 |
730 |
- ${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2 |
731 |
- ${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2 |
732 |
-" |
733 |
- |
734 |
-LICENSE="GPL-2" |
735 |
-SLOT="$(ver_cut 1)" |
736 |
-KEYWORDS="amd64 ~ppc64 ~x86" |
737 |
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart" |
738 |
- |
739 |
-COMMON_DEPEND=" |
740 |
- media-libs/freetype:2= |
741 |
- media-libs/giflib:0/7 |
742 |
- sys-libs/zlib |
743 |
-" |
744 |
-# Many libs are required to build, but not to run, make is possible to remove |
745 |
-# by listing conditionally in RDEPEND unconditionally in DEPEND |
746 |
-RDEPEND=" |
747 |
- ${COMMON_DEPEND} |
748 |
- >=sys-apps/baselayout-java-0.1.0-r1 |
749 |
- !headless-awt? ( |
750 |
- x11-libs/libX11 |
751 |
- x11-libs/libXext |
752 |
- x11-libs/libXi |
753 |
- x11-libs/libXrender |
754 |
- x11-libs/libXt |
755 |
- x11-libs/libXtst |
756 |
- ) |
757 |
- alsa? ( media-libs/alsa-lib ) |
758 |
- cups? ( net-print/cups ) |
759 |
- selinux? ( sec-policy/selinux-java ) |
760 |
-" |
761 |
- |
762 |
-DEPEND=" |
763 |
- ${COMMON_DEPEND} |
764 |
- app-arch/zip |
765 |
- media-libs/alsa-lib |
766 |
- net-print/cups |
767 |
- x11-base/xorg-proto |
768 |
- x11-libs/libX11 |
769 |
- x11-libs/libXext |
770 |
- x11-libs/libXi |
771 |
- x11-libs/libXrender |
772 |
- x11-libs/libXt |
773 |
- x11-libs/libXtst |
774 |
- || ( |
775 |
- dev-java/openjdk-bin:${SLOT} |
776 |
- dev-java/icedtea-bin:${SLOT} |
777 |
- dev-java/openjdk:${SLOT} |
778 |
- dev-java/icedtea:${SLOT} |
779 |
- ) |
780 |
-" |
781 |
- |
782 |
-PDEPEND=" |
783 |
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
784 |
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
785 |
-" |
786 |
- |
787 |
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" |
788 |
- |
789 |
-# The space required to build varies wildly depending on USE flags, |
790 |
-# ranging from 2GB to 16GB. This function is certainly not exact but |
791 |
-# should be close enough to be useful. |
792 |
-openjdk_check_requirements() { |
793 |
- local M |
794 |
- M=2048 |
795 |
- M=$(( $(usex debug 3 1) * $M )) |
796 |
- M=$(( $(usex jbootstrap 2 1) * $M )) |
797 |
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) |
798 |
- |
799 |
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} |
800 |
-} |
801 |
- |
802 |
-pkg_pretend() { |
803 |
- openjdk_check_requirements |
804 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
805 |
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}" |
806 |
- fi |
807 |
-} |
808 |
- |
809 |
-pkg_setup() { |
810 |
- openjdk_check_requirements |
811 |
- |
812 |
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}" |
813 |
- JAVA_PKG_WANT_SOURCE="${SLOT}" |
814 |
- JAVA_PKG_WANT_TARGET="${SLOT}" |
815 |
- |
816 |
- java-vm-2_pkg_setup |
817 |
- java-pkg-2_pkg_setup |
818 |
-} |
819 |
- |
820 |
-src_prepare() { |
821 |
- default |
822 |
- chmod +x configure || die |
823 |
- local repo |
824 |
- for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do |
825 |
- ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die |
826 |
- done |
827 |
- # new warnings in new gcc https://bugs.gentoo.org/685426 |
828 |
- sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \ |
829 |
- hotspot/make/linux/makefiles/gcc.make || die |
830 |
-} |
831 |
- |
832 |
-src_configure() { |
833 |
- # general build info found here: |
834 |
- #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html |
835 |
- |
836 |
- # Work around stack alignment issue, bug #647954. |
837 |
- use x86 && append-flags -mincoming-stack-boundary=2 |
838 |
- |
839 |
- # Work around -fno-common ( GCC10 default ), bug #706638 |
840 |
- append-flags -fcommon |
841 |
- |
842 |
- local myconf=( |
843 |
- --disable-ccache |
844 |
- --enable-unlimited-crypto |
845 |
- --with-boot-jdk="${JDK_HOME}" |
846 |
- --with-extra-cflags="${CFLAGS}" |
847 |
- --with-extra-cxxflags="${CXXFLAGS}" |
848 |
- --with-extra-ldflags="${LDFLAGS}" |
849 |
- --with-giflib=system |
850 |
- --with-jtreg=no |
851 |
- --with-jobs=1 |
852 |
- --with-num-cores=1 |
853 |
- --with-update-version="$(ver_cut 2)" |
854 |
- --with-build-number="b$(ver_cut 4)" |
855 |
- --with-milestone="fcs" # magic variable that means "release version" |
856 |
- --with-vendor-name="Gentoo" |
857 |
- --with-vendor-url="https://gentoo.org" |
858 |
- --with-vendor-bug-url="https://bugs.gentoo.org" |
859 |
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" |
860 |
- --with-zlib=system |
861 |
- --with-native-debug-symbols=$(usex debug internal none) |
862 |
- $(usex headless-awt --disable-headful '') |
863 |
- ) |
864 |
- |
865 |
- # PaX breaks pch, bug #601016 |
866 |
- if use pch && ! host-is-pax; then |
867 |
- myconf+=( --enable-precompiled-headers ) |
868 |
- else |
869 |
- myconf+=( --disable-precompiled-headers ) |
870 |
- fi |
871 |
- |
872 |
- ( |
873 |
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS |
874 |
- CFLAGS= CXXFLAGS= LDFLAGS= \ |
875 |
- CONFIG_SITE=/dev/null \ |
876 |
- econf "${myconf[@]}" |
877 |
- ) |
878 |
-} |
879 |
- |
880 |
-src_compile() { |
881 |
- local myemakeargs=( |
882 |
- JOBS=$(makeopts_jobs) |
883 |
- LOG=debug |
884 |
- $(usex doc docs '') |
885 |
- $(usex jbootstrap bootcycle-images images) |
886 |
- ) |
887 |
- emake "${myemakeargs[@]}" -j1 #nowarn |
888 |
-} |
889 |
- |
890 |
-src_install() { |
891 |
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}" |
892 |
- local ddest="${ED%/}/${dest#/}" |
893 |
- |
894 |
- cd "${S}"/build/*-release/images/j2sdk-image || die |
895 |
- |
896 |
- if ! use alsa; then |
897 |
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die |
898 |
- fi |
899 |
- |
900 |
- # stupid build system does not remove that |
901 |
- if use headless-awt ; then |
902 |
- rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \ |
903 |
- {,jre/}bin/policytool bin/appletviewer || die |
904 |
- fi |
905 |
- |
906 |
- if ! use examples ; then |
907 |
- rm -vr demo/ || die |
908 |
- fi |
909 |
- |
910 |
- if ! use source ; then |
911 |
- rm -v src.zip || die |
912 |
- fi |
913 |
- |
914 |
- dodir "${dest}" |
915 |
- cp -pPR * "${ddest}" || die |
916 |
- |
917 |
- dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts |
918 |
- |
919 |
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh |
920 |
- java-vm_set-pax-markings "${ddest}" |
921 |
- java-vm_revdep-mask |
922 |
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
923 |
- |
924 |
- if use doc ; then |
925 |
- docinto html |
926 |
- dodoc -r "${S}"/build/*-release/docs/* |
927 |
- fi |
928 |
-} |
929 |
- |
930 |
-pkg_postinst() { |
931 |
- java-vm-2_pkg_postinst |
932 |
-} |