1 |
commit: 50bc785fdd65ff5c2c6238e04de3b6f75c175289 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 22 23:53:44 2019 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 22 23:58:30 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50bc785f |
7 |
|
8 |
dev-java/openjdk-bin: keyword :11 on ~arm |
9 |
|
10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.15 |
11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
12 |
|
13 |
dev-java/openjdk-bin/Manifest | 1 + |
14 |
dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild | 11 +++++++++-- |
15 |
2 files changed, 10 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest |
18 |
index dcd35c52ece..6f2957ca976 100644 |
19 |
--- a/dev-java/openjdk-bin/Manifest |
20 |
+++ b/dev-java/openjdk-bin/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz 194142513 BLAKE2B 1809ee89a4dd31d5453d15b0e3672e1d4a9e1e4573954a8dcf793cb4f837ca4bb44eab73fb685896273fa5301011d671568cb7648c0c5095659f5441a559bfad SHA512 22964e4b0819eb214f378969501b9ad67e39f4efeb7425245022f7eae804386a5e0c7a8139a5df604efd649ff1d551323e6b08299ce0e3f71719e3cd120d7b91 |
23 |
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz 174868718 BLAKE2B 74c482d6cdc4066e4c8fbc93ab7f44165dc55c360d7cab36228032b76073217546e046e0556ae9aac3de05a69e860aa06d3a55d9f2aac1e8ccce1b650f45b464 SHA512 053787da52083f8e4cfd808205a965486d88f6e61117119ee7a5c359eb02564e581f0111ee9738feed3424eb8abc55e9e8d94d6558a63b3be7150361aaa39a89 |
24 |
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.3_7.tar.gz 180425080 BLAKE2B 77f571a145e837c80da49a2ef8d20089b24ec23abf8078cc5781762ec9b88038d4c47c9d36766195c2f96809c98e4706b249c14518ef450b1fbfb100ba8c49d8 SHA512 6b7542fcbd9b727e93a2c2e157ecd52fb27db74d67cc98fb713eed531c7ea4420fdae2e420131b3d046e6ad2bccb2f91461928750e7b9c4274984a983293be8a |
25 |
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a |
26 |
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2 |
27 |
|
28 |
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild |
29 |
index a70143ee9f5..dfe0d4c44d1 100644 |
30 |
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild |
31 |
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild |
32 |
@@ -15,15 +15,16 @@ MY_PV=${PV/_p/+} |
33 |
SLOT=${MY_PV%%[.+]*} |
34 |
|
35 |
SRC_URI=" |
36 |
- $(abi_uri x64 amd64) |
37 |
+ $(abi_uri arm) |
38 |
$(abi_uri aarch64 arm64) |
39 |
$(abi_uri ppc64le ppc64) |
40 |
+ $(abi_uri x64 amd64) |
41 |
" |
42 |
|
43 |
DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK" |
44 |
HOMEPAGE="https://adoptopenjdk.net" |
45 |
LICENSE="GPL-2-with-classpath-exception" |
46 |
-KEYWORDS="~amd64 ~arm64 ~ppc64" |
47 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" |
48 |
IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart" |
49 |
|
50 |
RDEPEND=" |
51 |
@@ -52,6 +53,12 @@ QA_PREBUILT="*" |
52 |
|
53 |
S="${WORKDIR}/jdk-${MY_PV}" |
54 |
|
55 |
+pkg_pretend() { |
56 |
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then |
57 |
+ die "These binaries require a hardfloat system." |
58 |
+ fi |
59 |
+} |
60 |
+ |
61 |
src_install() { |
62 |
local dest="/opt/${P}" |
63 |
local ddest="${ED%/}/${dest#/}" |