Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/
Date: Thu, 18 Apr 2019 19:03:00
Message-Id: 1555613678.8f1cd346100c02c2346f18e3a7585ab967136ac5.gyakovlev@gentoo
1 commit: 8f1cd346100c02c2346f18e3a7585ab967136ac5
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 18 18:40:37 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 18 18:54:38 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1cd346
7
8 dev-java/openjdk: bump to 11.0.3_p7
9
10 Package-Manager: Portage-2.3.63, Repoman-2.3.12
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12
13 dev-java/openjdk/Manifest | 1 +
14 dev-java/openjdk/openjdk-11.0.3_p7.ebuild | 217 ++++++++++++++++++++++++++++++
15 2 files changed, 218 insertions(+)
16
17 diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
18 index 25916c24251..b739b13c2d3 100644
19 --- a/dev-java/openjdk/Manifest
20 +++ b/dev-java/openjdk/Manifest
21 @@ -1,4 +1,5 @@
22 DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952
23 +DIST jdk-11.0.3+7.tar.bz2 90300528 BLAKE2B db566140028ddbf9f6e10eaaac018ddf3ad13a954500c73abde8aec5c673c375f2cf0e56bc75c410a4ff90e6cb8e9c4580bb5719786e34865f00a92bd3ea8431 SHA512 46c1c13165e7d5ef480052810ccdc1b5d55f6b2b542e10303d3940536df7f17bf3d8a0cf774e73dc25af7cd69432790656a03c66d2df9efaf71cb9e44c2da684
24 DIST openjdk-8.202_p08.tar.bz2 449202 BLAKE2B 8f7442918c083e94cda0e029cf2348dd9242653027f84d66deebe162e0928b2c6a86d3f273ba235bad5e5656f2b109e6521aaccfa81332fea92873d008ac0c0d SHA512 586713b889dd60c7dc65fccd39ef3ddd985ebb95a7c6c1feaef3c8d76fd1d929bbf19a99f72274c1afb77bd7f80b581d44add4aa232358d8951f7cc5befb43d0
25 DIST openjdk-8.212_p03.tar.bz2 451800 BLAKE2B f8466a0d99650a07e3ff21e8dc06252ef9d31ce15e22c6ede15fc4c7b1633820e84e67aa501e816101c6bd473293fb897645b2df1530d8f7b81c6e8e6d38ce3a SHA512 ccc642da05aa00cfcc46c1eb759391dd2242218b7392bced77481600aa15b3b1d0a0c03380f59b6a6d038311721f249de1a6b116c6f651193cfb57b89fba4866
26 DIST openjdk-corba-8.202_p08.tar.bz2 1033539 BLAKE2B 9cbe20fb771157142329db037866ec7d67ff7e70318bec8b74034ce59574cd730975f0e7a3d6b88fc946b1d340558a92ca867639765a205883481fd071d7059e SHA512 9b25132c76f559055698c52888f6cae287096e05b89541cb8e445b46a488126a38e58d4f28649e277862eac7aa20f75f64dbcdcf56c900dcb0530a9545c4f717
27
28 diff --git a/dev-java/openjdk/openjdk-11.0.3_p7.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
29 new file mode 100644
30 index 00000000000..026d272de5e
31 --- /dev/null
32 +++ b/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
33 @@ -0,0 +1,217 @@
34 +# Copyright 1999-2019 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
40 +
41 +MY_PV=${PV/_p/+}
42 +SLOT=${MY_PV%%[.+]*}
43 +
44 +DESCRIPTION="Open source implementation of the Java programming language"
45 +HOMEPAGE="https://openjdk.java.net"
46 +SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
47 +
48 +LICENSE="GPL-2"
49 +KEYWORDS="~amd64 ~arm64 ~ppc64"
50 +
51 +IUSE="alsa cups debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
52 +
53 +CDEPEND="
54 + media-libs/freetype:2=
55 + sys-libs/zlib
56 + systemtap? ( dev-util/systemtap )
57 + !headless-awt? (
58 + x11-libs/libX11
59 + x11-libs/libXext
60 + x11-libs/libXi
61 + x11-libs/libXrender
62 + x11-libs/libXt
63 + x11-libs/libXtst
64 + )
65 +"
66 +
67 +# cups and alsa required to build, but not to run, make is possible to remove
68 +RDEPEND="
69 + ${CDEPEND}
70 + alsa? ( media-libs/alsa-lib )
71 + cups? ( net-print/cups )
72 + selinux? ( sec-policy/selinux-java )
73 +"
74 +
75 +DEPEND="
76 + ${CDEPEND}
77 + app-arch/zip
78 + media-libs/alsa-lib
79 + net-print/cups
80 + !headless-awt? (
81 + x11-base/xorg-proto
82 + )
83 + || (
84 + dev-java/openjdk-bin:${SLOT}
85 + dev-java/openjdk:${SLOT}
86 + )
87 +"
88 +
89 +PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
90 + nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
91 +
92 +S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
93 +
94 +# The space required to build varies wildly depending on USE flags,
95 +# ranging from 2GB to 16GB. This function is certainly not exact but
96 +# should be close enough to be useful.
97 +openjdk_check_requirements() {
98 + local M
99 + M=2048
100 + M=$(( $(usex jbootstrap 2 1) * $M ))
101 + M=$(( $(usex debug 3 1) * $M ))
102 + M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
103 +
104 + CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
105 +}
106 +
107 +pkg_pretend() {
108 + openjdk_check_requirements
109 + has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
110 +}
111 +
112 +pkg_setup() {
113 + openjdk_check_requirements
114 + java-vm-2_pkg_setup
115 +
116 + JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
117 + JAVA_PKG_WANT_SOURCE="${SLOT}"
118 + JAVA_PKG_WANT_TARGET="${SLOT}"
119 +
120 + # The nastiness below is necessary while the gentoo-vm USE flag is
121 + # masked. First we call java-pkg-2_pkg_setup if it looks like the
122 + # flag was unmasked against one of the possible build VMs. If not,
123 + # we try finding one of them in their expected locations. This would
124 + # have been slightly less messy if openjdk-bin had been installed to
125 + # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
126 + # file but disable it so that it would not normally be selectable.
127 +
128 + local vm
129 + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
130 + if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
131 + java-pkg-2_pkg_setup
132 + return
133 + fi
134 + done
135 +
136 + if has_version --host-root dev-java/openjdk:${SLOT}; then
137 + export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
138 + else
139 + JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
140 + [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
141 + JDK_HOME=${JDK_HOME#*/}
142 + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
143 + export JDK_HOME
144 + fi
145 +}
146 +
147 +src_prepare() {
148 + default
149 + chmod +x configure || die
150 +}
151 +
152 +src_configure() {
153 + # Work around stack alignment issue, bug #647954. in case we ever have x86
154 + use x86 && append-flags -mincoming-stack-boundary=2
155 +
156 + # Enabling full docs appears to break doc building. If not
157 + # explicitly disabled, the flag will get auto-enabled if pandoc and
158 + # graphviz are detected. pandoc has loads of dependencies anyway.
159 + # currently it still bundles lcms libpng giflib and libjpeg.
160 +
161 + local myconf=(
162 + --disable-ccache
163 + --enable-full-docs=no
164 + --with-boot-jdk="${JDK_HOME}"
165 + --with-extra-cflags="${CFLAGS}"
166 + --with-extra-cxxflags="${CXXFLAGS}"
167 + --with-extra-ldflags="${LDFLAGS}"
168 + --with-native-debug-symbols=$(usex debug internal none)
169 + --with-vendor-name="Gentoo"
170 + --with-vendor-url="https://gentoo.org"
171 + --with-vendor-bug-url="https://bugs.gentoo.org"
172 + --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
173 + --with-vendor-version-string="${PV}"
174 + --with-version-pre=gentoo
175 + --with-version-string=${MY_PV%+*}
176 + --with-version-build=${MY_PV#*+}
177 + --with-zlib=system
178 + --enable-dtrace=$(usex systemtap yes no)
179 + --enable-headless-only=$(usex headless-awt yes no)
180 + )
181 +
182 + # PaX breaks pch, bug #601016
183 + if use pch && ! host-is-pax; then
184 + myconf+=( --enable-precompiled-headers )
185 + else
186 + myconf+=( --disable-precompiled-headers )
187 + fi
188 +
189 + (
190 + unset _JAVA_OPTIONS JAVA JAVAC XARGS
191 + CFLAGS= CXXFLAGS= LDFLAGS= \
192 + CONFIG_SITE=/dev/null \
193 + econf "${myconf[@]}"
194 + )
195 +}
196 +
197 +src_compile() {
198 + emake -j1 \
199 + $(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \
200 + JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
201 +}
202 +
203 +src_install() {
204 + local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
205 + local ddest="${ED}${dest#/}"
206 +
207 + cd "${S}"/build/*-release/images/jdk || die
208 +
209 + # Oracle and IcedTea have libjsoundalsa.so depending on
210 + # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
211 + if ! use alsa ; then
212 + rm -v lib/libjsound.* || die
213 + fi
214 +
215 + if ! use examples ; then
216 + rm -vr demo/ || die
217 + fi
218 +
219 + if ! use source ; then
220 + rm -v lib/src.zip || die
221 + fi
222 +
223 + dodir "${dest}"
224 + cp -pPR * "${ddest}" || die
225 +
226 + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
227 + java-vm_set-pax-markings "${ddest}"
228 + java-vm_revdep-mask
229 + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
230 +
231 + if use doc ; then
232 + insinto /usr/share/doc/${PF}/html
233 + doins -r "${S}"/build/*-release/images/docs/*
234 + fi
235 +}
236 +
237 +pkg_postinst() {
238 + java-vm-2_pkg_postinst
239 +
240 + if use gentoo-vm ; then
241 + ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
242 + ewarn "recognised by the system. This will almost certainly break things."
243 + else
244 + ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
245 + ewarn "will not be recognised by the system. For example, simply calling"
246 + ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
247 + ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
248 + ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
249 + fi
250 +}