Clean up
This commit is contained in:
parent
8da780465c
commit
19aac16965
@ -1,12 +1,5 @@
|
||||
DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d
|
||||
DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67
|
||||
DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 5c3b43f160009144636becd6aae19559e8f03e4d6461f89c1b6c472e63c6f4c2c6064bb3dc24c825814e7d6cc927f66fe96793bd2c71a80e2b535eec0f685278 SHA512 1c2de73051a665ada6a12bb6f92f18b1d9366990cea403063d20937ac97c288f923746a0d094273ad7f7238cef1ebe1790c0f0ffe7e7acc07ad08ebc6a7ea085
|
||||
DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c
|
||||
DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa
|
||||
DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
|
||||
DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
|
||||
DIST openjdk-bootstrap-11.0.14_p9-riscv.tar.xz 104601676 BLAKE2B 5f976e8a626a829fae70ad6c007f10bfeff79e29c85d6c75fb2f5ff8984fd2a2bd44ee6e07958dbbdaaed761c6839d375e1b5ba6cffc63b02ad9e2c9178310db SHA512 580dec81626553fe3e7afd0f6385a733ba80a0502cf0f9e8bdc973048887290c9ab6171267d61d8838c4ece4de58c9ca8b78540bd52b1757495a27175057ec64
|
||||
DIST openjdk-bootstrap-17.0.1_p12-ppc64.tar.xz 116557680 BLAKE2B d20e45a5a76e30ee60446993bf5dcf0fa10b8b668ebec637ea02b458a472c642f22740e18f28cbf9923ea4cceb17702115c038b13137442e5f0572477d37f12f SHA512 92e0343f493d094300911625a561f42c47402ca4cdbd2ac18414089e8ed8a50ca58f02ec1ef9a3dce017ab7af99a22ab465ddf732ab9e55728e2b146de56fba7
|
||||
DIST openjdk-bootstrap-17.0.1_p12-x86.tar.xz 111479904 BLAKE2B 17d33f8ee81c2846f417d8e7cd1429eb611e916a6b375c76127179dc6afc55b0254248360c892ce37a178fd553934d952ec8955ff5d0613eb66678b8ecefe917 SHA512 094bcc960801e5fd7e1c966c8101c195ac7fa5e222d9c8e79ca64f8a3e6812613c17a0356211e7dd831325fa11af88cc22ed56c434d65504f18dd4f4ceaedfdf
|
||||
DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab078085f094bbcc65448458d98a0f521e3b754c5118b1b4f957cfa00c24e896c811c2a477822c469ffcfe0de1ad6a8d0b7db23b0b09ae3b459eaf8c4fc8 SHA512 e30acd6c64a0095f4203129ecf2cff4c6b4293bc017457465d3abb746d280a2f5d89028eed22f7f3d236890d047149c7aa257e3b49593d7a6ab4dd6b777a7c26
|
||||
DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
VERSION="OpenJDK ${PV}"
|
||||
JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
|
||||
JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}"
|
||||
JAVAC="\${JAVA_HOME}/bin/javac"
|
||||
PATH="\${JAVA_HOME}/bin"
|
||||
ROOTPATH="\${JAVA_HOME}/bin"
|
||||
LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
|
||||
MANPATH=""
|
||||
PROVIDES_TYPE="JDK JRE"
|
||||
PROVIDES_VERSION="${SLOT}"
|
||||
BOOTCLASSPATH=""
|
||||
GENERATION="2"
|
||||
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
|
||||
@ -43,7 +43,7 @@ SRC_URI="
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source system-bootstrap systemtap"
|
||||
|
||||
|
||||
@ -1,305 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
|
||||
|
||||
# variable name format: <UPPERCASE_KEYWORD>_XPAK
|
||||
ARM64_XPAK="17.0.2_p8" # musl bootstrap install
|
||||
PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball
|
||||
RISCV_XPAK="17.0.3_p7"
|
||||
X86_XPAK="17.0.1_p12"
|
||||
|
||||
# Usage: bootstrap_uri <keyword> <version> [extracond]
|
||||
# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian)
|
||||
# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) )
|
||||
bootstrap_uri() {
|
||||
local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap"
|
||||
local suff="tar.xz"
|
||||
local kw="${1:?${FUNCNAME[0]}: keyword not specified}"
|
||||
local ver="${2:?${FUNCNAME[0]}: version not specified}"
|
||||
local cond="${3-}"
|
||||
[[ ${cond} == elibc_musl* ]] && local musl=yes
|
||||
|
||||
# here be dragons
|
||||
echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
|
||||
}
|
||||
|
||||
MY_PV="${PV//_p/+}"
|
||||
SLOT="$(ver_cut 1)"
|
||||
|
||||
DESCRIPTION="Open source implementation of the Java programming language"
|
||||
HOMEPAGE="https://openjdk.java.net"
|
||||
SRC_URI="
|
||||
https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
!system-bootstrap? (
|
||||
$(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl)
|
||||
$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
|
||||
$(bootstrap_uri x86 ${X86_XPAK})
|
||||
$(bootstrap_uri riscv ${RISCV_XPAK})
|
||||
)
|
||||
riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz )
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
|
||||
|
||||
IUSE="alsa big-endian cups debug doc examples +gentoo-vm headless-awt +jbootstrap selinux source system-bootstrap systemtap"
|
||||
|
||||
REQUIRED_USE="
|
||||
alsa !headless-awt
|
||||
!system-bootstrap? ( jbootstrap )
|
||||
"
|
||||
|
||||
COMMON_DEPEND="
|
||||
media-libs/freetype:2=
|
||||
media-libs/giflib:0/7
|
||||
media-libs/harfbuzz:=
|
||||
media-libs/libpng:0=
|
||||
media-libs/lcms:2=
|
||||
sys-libs/zlib
|
||||
virtual/jpeg:0=
|
||||
systemtap? ( dev-util/systemtap )
|
||||
"
|
||||
|
||||
# Many libs are required to build, but not to run, make is possible to remove
|
||||
# by listing conditionally in RDEPEND unconditionally in DEPEND
|
||||
RDEPEND="
|
||||
${COMMON_DEPEND}
|
||||
>=sys-apps/baselayout-java-0.1.0-r1
|
||||
!headless-awt? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
)
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
cups? ( net-print/cups )
|
||||
selinux? ( sec-policy/selinux-java )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
app-arch/zip
|
||||
media-libs/alsa-lib
|
||||
net-print/cups
|
||||
x11-base/xorg-proto
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
dev-java/openjfx:${SLOT}=
|
||||
system-bootstrap? (
|
||||
|| (
|
||||
dev-java/openjdk-bin:${SLOT}
|
||||
dev-java/openjdk:${SLOT}
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
|
||||
|
||||
# The space required to build varies wildly depending on USE flags,
|
||||
# ranging from 2GB to 16GB. This function is certainly not exact but
|
||||
# should be close enough to be useful.
|
||||
openjdk_check_requirements() {
|
||||
local M
|
||||
M=2048
|
||||
M=$(( $(usex jbootstrap 2 1) * $M ))
|
||||
M=$(( $(usex debug 3 1) * $M ))
|
||||
M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
|
||||
|
||||
CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
openjdk_check_requirements
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
openjdk_check_requirements
|
||||
java-vm-2_pkg_setup
|
||||
|
||||
[[ ${MERGE_TYPE} == "binary" ]] && return
|
||||
|
||||
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
|
||||
JAVA_PKG_WANT_SOURCE="${SLOT}"
|
||||
JAVA_PKG_WANT_TARGET="${SLOT}"
|
||||
|
||||
# The nastiness below is necessary while the gentoo-vm USE flag is
|
||||
# masked. First we call java-pkg-2_pkg_setup if it looks like the
|
||||
# flag was unmasked against one of the possible build VMs. If not,
|
||||
# we try finding one of them in their expected locations. This would
|
||||
# have been slightly less messy if openjdk-bin had been installed to
|
||||
# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
|
||||
# file but disable it so that it would not normally be selectable.
|
||||
|
||||
local vm
|
||||
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
|
||||
if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
|
||||
java-pkg-2_pkg_setup
|
||||
return
|
||||
fi
|
||||
done
|
||||
|
||||
if has_version dev-java/openjdk:${SLOT}; then
|
||||
export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
|
||||
elif use !system-bootstrap ; then
|
||||
local xpakvar="${ARCH^^}_XPAK"
|
||||
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
|
||||
else
|
||||
JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
|
||||
[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
|
||||
JDK_HOME=${JDK_HOME#*/}
|
||||
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
|
||||
export JDK_HOME
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch
|
||||
default
|
||||
chmod +x configure || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Work around stack alignment issue, bug #647954. in case we ever have x86
|
||||
use x86 && append-flags -mincoming-stack-boundary=2
|
||||
|
||||
# Work around -fno-common ( GCC10 default ), bug #713180
|
||||
append-flags -fcommon
|
||||
|
||||
# Strip some flags users may set, but should not. #818502
|
||||
filter-flags -fexceptions
|
||||
|
||||
# Enabling full docs appears to break doc building. If not
|
||||
# explicitly disabled, the flag will get auto-enabled if pandoc and
|
||||
# graphviz are detected. pandoc has loads of dependencies anyway.
|
||||
|
||||
local myconf=(
|
||||
--disable-ccache
|
||||
--disable-precompiled-headers
|
||||
--disable-warnings-as-errors
|
||||
--enable-full-docs=no
|
||||
--with-boot-jdk="${JDK_HOME}"
|
||||
--with-extra-cflags="${CFLAGS}"
|
||||
--with-extra-cxxflags="${CXXFLAGS}"
|
||||
--with-extra-ldflags="${LDFLAGS}"
|
||||
--with-freetype="${XPAK_BOOTSTRAP:-system}"
|
||||
--with-giflib="${XPAK_BOOTSTRAP:-system}"
|
||||
--with-harfbuzz="${XPAK_BOOTSTRAP:-system}"
|
||||
--with-lcms="${XPAK_BOOTSTRAP:-system}"
|
||||
--with-libjpeg="${XPAK_BOOTSTRAP:-system}"
|
||||
--with-libpng="${XPAK_BOOTSTRAP:-system}"
|
||||
--with-native-debug-symbols=$(usex debug internal none)
|
||||
--with-vendor-name="Gentoo"
|
||||
--with-vendor-url="https://gentoo.org"
|
||||
--with-vendor-bug-url="https://bugs.gentoo.org"
|
||||
--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
|
||||
--with-vendor-version-string="${PVR}"
|
||||
--with-version-pre=""
|
||||
--with-version-string="${PV%_p*}"
|
||||
--with-version-build="${PV#*_p}"
|
||||
--with-zlib="${XPAK_BOOTSTRAP:-system}"
|
||||
--enable-dtrace=$(usex systemtap yes no)
|
||||
--enable-headless-only=$(usex headless-awt yes no)
|
||||
$(tc-is-clang && echo "--with-toolchain-type=clang")
|
||||
)
|
||||
|
||||
use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
|
||||
|
||||
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
|
||||
if [[ -r ${zip} ]]; then
|
||||
myconf+=( --with-import-modules="${zip}" )
|
||||
else
|
||||
die "${zip} not found or not readable"
|
||||
fi
|
||||
|
||||
if use !system-bootstrap ; then
|
||||
addpredict /dev/random
|
||||
addpredict /proc/self/coredump_filter
|
||||
fi
|
||||
|
||||
(
|
||||
unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
|
||||
CFLAGS= CXXFLAGS= LDFLAGS= \
|
||||
CONFIG_SITE=/dev/null \
|
||||
econf "${myconf[@]}"
|
||||
)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local myemakeargs=(
|
||||
JOBS=$(makeopts_jobs)
|
||||
LOG=debug
|
||||
CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
|
||||
NICE= # Use PORTAGE_NICENESS, don't adjust further down
|
||||
$(usex doc docs '')
|
||||
$(usex jbootstrap bootcycle-images product-images)
|
||||
)
|
||||
emake "${myemakeargs[@]}" -j1 #nowarn
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
|
||||
local ddest="${ED}/${dest#/}"
|
||||
|
||||
cd "${S}"/build/*-release/images/jdk || die
|
||||
|
||||
# Create files used as storage for system preferences.
|
||||
mkdir .systemPrefs || die
|
||||
touch .systemPrefs/.system.lock || die
|
||||
touch .systemPrefs/.systemRootModFile || die
|
||||
|
||||
# Oracle and IcedTea have libjsoundalsa.so depending on
|
||||
# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
|
||||
if ! use alsa ; then
|
||||
rm -v lib/libjsound.* || die
|
||||
fi
|
||||
|
||||
if ! use examples ; then
|
||||
rm -vr demo/ || die
|
||||
fi
|
||||
|
||||
if ! use source ; then
|
||||
rm -v lib/src.zip || die
|
||||
fi
|
||||
|
||||
rm -v lib/security/cacerts || die
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR * "${ddest}" || die
|
||||
|
||||
dosym -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
|
||||
|
||||
# must be done before running itself
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
einfo "Creating the Class Data Sharing archives and disabling usage tracking"
|
||||
"${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
|
||||
|
||||
use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
|
||||
java-vm_revdep-mask
|
||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
||||
|
||||
if use doc ; then
|
||||
docinto html
|
||||
dodoc -r "${S}"/build/*-release/images/docs/*
|
||||
dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
java-vm-2_pkg_postinst
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user