mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 14:49:30 -07:00
dev-java/openjdk: add 21.0.12.1_p1-r1, compile in headless mode without x11 libraries
According to JDK-8376684 Bug: https://bugs.gentoo.org/981689 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/1767 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Volkmar W. Pogatzki
committed by
Miroslav Šulc
Miroslav Šulc
parent
5df09651a6
commit
e4898aa1f8
127
dev-java/openjdk/files/openjdk-21.0.12.1_p1-headless.patch
Normal file
127
dev-java/openjdk/files/openjdk-21.0.12.1_p1-headless.patch
Normal file
@@ -0,0 +1,127 @@
|
||||
From 4c499860c3a112f5260348be971956dce292902e Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Devoogdt <thomas@devoogdt.com>
|
||||
Date: Wed, 4 Feb 2026 06:48:59 +0000
|
||||
Subject: [PATCH] Backport 1069ccebcc32e02055985e2babfa2986a2e295ca
|
||||
|
||||
---
|
||||
doc/building.html | 7 +++----
|
||||
doc/building.md | 6 ++----
|
||||
make/autoconf/libraries.m4 | 8 ++++----
|
||||
make/modules/java.desktop/lib/Awt2dLibraries.gmk | 16 ++++++++++++++--
|
||||
.../unix/native/common/awt/utility/rect.h | 4 ++--
|
||||
5 files changed, 25 insertions(+), 16 deletions(-)
|
||||
|
||||
--- a/doc/building.html
|
||||
+++ b/doc/building.html
|
||||
@@ -1339,10 +1339,9 @@ <h4 id="alsa-1">ALSA</h4>
|
||||
point it out by <code>--with-alsa</code>.</li>
|
||||
</ul>
|
||||
<h4 id="x11-1">X11</h4>
|
||||
-<p>You will need X11 libraries suitable for your <em>target</em> system.
|
||||
-For most cases, using Debian's pre-built libraries work fine.</p>
|
||||
-<p>Note that X11 is needed even if you only want to build a headless
|
||||
-JDK.</p>
|
||||
+<p>When not building a headless JDK, you will need X11 libraries
|
||||
+suitable for your <em>target</em> system. In most cases, using Debian's
|
||||
+pre-built libraries work fine.</p>
|
||||
<ul>
|
||||
<li><p>Go to <a href="https://www.debian.org/distrib/packages">Debian
|
||||
Package Search</a>, search for the following packages for your
|
||||
--- a/doc/building.md
|
||||
+++ b/doc/building.md
|
||||
@@ -1108,10 +1108,8 @@ dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .
|
||||
|
||||
#### X11
|
||||
|
||||
-You will need X11 libraries suitable for your *target* system. For most cases,
|
||||
-using Debian's pre-built libraries work fine.
|
||||
-
|
||||
-Note that X11 is needed even if you only want to build a headless JDK.
|
||||
+When not building a headless JDK, you will need X11 libraries suitable for your
|
||||
+*target* system. In most cases, using Debian's pre-built libraries work fine.
|
||||
|
||||
* Go to [Debian Package Search](https://www.debian.org/distrib/packages),
|
||||
search for the following packages for your *target* system, and download them
|
||||
--- a/make/autoconf/libraries.m4
|
||||
+++ b/make/autoconf/libraries.m4
|
||||
@@ -42,12 +42,12 @@ m4_include([lib-tests.m4])
|
||||
AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
|
||||
[
|
||||
# Check if X11 is needed
|
||||
- if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
|
||||
- # No X11 support on windows or macosx
|
||||
+ if test "x$OPENJDK_TARGET_OS" = xwindows ||
|
||||
+ test "x$OPENJDK_TARGET_OS" = xmacosx ||
|
||||
+ test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
|
||||
NEEDS_LIB_X11=false
|
||||
else
|
||||
- # All other instances need X11, even if building headless only, libawt still
|
||||
- # needs X11 headers.
|
||||
+ # All other instances need X11 for libawt.
|
||||
NEEDS_LIB_X11=true
|
||||
fi
|
||||
|
||||
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
|
||||
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
|
||||
@@ -77,6 +77,10 @@ ifeq ($(call isTargetOs, windows), true)
|
||||
#
|
||||
endif
|
||||
|
||||
+ifeq ($(ENABLE_HEADLESS_ONLY), true)
|
||||
+ LIBAWT_CFLAGS += -DHEADLESS
|
||||
+endif
|
||||
+
|
||||
ifeq ($(call isTargetOs, linux macosx aix), true)
|
||||
LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
|
||||
endif
|
||||
@@ -379,13 +383,20 @@ ifeq ($(call isTargetOs, windows macosx), false)
|
||||
$(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
|
||||
#
|
||||
|
||||
- LIBAWT_HEADLESS_EXCLUDES := medialib
|
||||
+ LIBAWT_HEADLESS_EXCLUDES := medialib opengl
|
||||
+
|
||||
+ LIBAWT_HEADLESS_EXCLUDE_FILES := \
|
||||
+ GLXGraphicsConfig.c \
|
||||
+ GLXSurfaceData.c \
|
||||
+ X11PMBlitLoops.c \
|
||||
+ X11Renderer.c \
|
||||
+ X11SurfaceData.c \
|
||||
+ #
|
||||
|
||||
LIBAWT_HEADLESS_EXTRA_HEADER_DIRS := \
|
||||
$(LIBAWT_DEFAULT_HEADER_DIRS) \
|
||||
common/awt/debug \
|
||||
common/font \
|
||||
- common/java2d/opengl \
|
||||
#
|
||||
|
||||
LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \
|
||||
@@ -395,6 +406,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
|
||||
NAME := awt_headless, \
|
||||
EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
|
||||
EXCLUDES := $(LIBAWT_HEADLESS_EXCLUDES), \
|
||||
+ EXCLUDE_FILES := $(LIBAWT_HEADLESS_EXCLUDE_FILES), \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(LIBAWT_HEADLESS_CFLAGS), \
|
||||
--- a/src/java.desktop/unix/native/common/awt/utility/rect.h
|
||||
+++ b/src/java.desktop/unix/native/common/awt/utility/rect.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#ifndef _AWT_RECT_H
|
||||
#define _AWT_RECT_H
|
||||
|
||||
-#ifndef MACOSX
|
||||
+#if !defined(HEADLESS) && !defined(MACOSX)
|
||||
#include <X11/Xlib.h>
|
||||
typedef XRectangle RECT_T;
|
||||
#else
|
||||
@@ -39,7 +39,7 @@ typedef struct {
|
||||
int width;
|
||||
int height;
|
||||
} RECT_T;
|
||||
-#endif /* !MACOSX */
|
||||
+#endif /* !HEADLESS && !MACOSX */
|
||||
|
||||
#define RECT_EQ_X(r1,r2) ((r1).x==(r2).x && (r1).width==(r2).width)
|
||||
|
||||
325
dev-java/openjdk/openjdk-21.0.12.1_p1-r1.ebuild
Normal file
325
dev-java/openjdk/openjdk-21.0.12.1_p1-r1.ebuild
Normal file
@@ -0,0 +1,325 @@
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit check-reqs dot-a flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
|
||||
|
||||
# variable name format: <UPPERCASE_KEYWORD>_XPAK
|
||||
PPC64_XPAK="21.0.0_p35" # big-endian bootstrap tarball
|
||||
X86_XPAK="21.0.0_p35"
|
||||
|
||||
# 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://distfiles.gentoo.org/pub/dev/arthurzam@gentoo.org/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:+) })"
|
||||
}
|
||||
|
||||
# don't change versioning scheme
|
||||
# to find correct _p number, look at
|
||||
# https://github.com/openjdk/jdk${SLOT}u/tags
|
||||
# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
|
||||
# to exact same commit sha. we should always use the full version.
|
||||
# -ga tag is just for humans to easily identify General Availability release tag.
|
||||
MY_PV="${PV%_p*}-ga"
|
||||
|
||||
DESCRIPTION="Open source implementation of the Java programming language"
|
||||
HOMEPAGE="https://openjdk.org"
|
||||
SRC_URI="
|
||||
https://github.com/${PN}/jdk21u/archive/jdk-${MY_PV}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
!system-bootstrap? (
|
||||
$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
|
||||
$(bootstrap_uri x86 ${X86_XPAK})
|
||||
)
|
||||
"
|
||||
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"
|
||||
|
||||
LICENSE="GPL-2-with-classpath-exception"
|
||||
SLOT="$(ver_cut 1)"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
|
||||
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap"
|
||||
|
||||
REQUIRED_USE="
|
||||
!system-bootstrap? ( jbootstrap )
|
||||
!system-bootstrap? ( || ( ppc64 x86 ) )
|
||||
"
|
||||
|
||||
COMMON_DEPEND="
|
||||
media-libs/freetype:2=
|
||||
media-libs/giflib:0/7
|
||||
media-libs/harfbuzz:=
|
||||
media-libs/libpng:0=
|
||||
media-libs/lcms:2=
|
||||
virtual/zlib:=
|
||||
!headless-awt? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXi
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
)
|
||||
media-libs/libjpeg-turbo:0=
|
||||
systemtap? ( dev-debug/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
|
||||
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
|
||||
!headless-awt? ( x11-base/xorg-proto )
|
||||
system-bootstrap? (
|
||||
|| (
|
||||
dev-java/openjdk-bin:${SLOT}
|
||||
dev-java/openjdk:${SLOT}
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/openjdk-21.0.12.1_p1-headless.patch )
|
||||
|
||||
# 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 ${BROOT}/usr/lib/jvm/${vm} ]]; then
|
||||
java-pkg-2_pkg_setup
|
||||
return
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
chmod +x configure || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
if has_version dev-java/openjdk:${SLOT}; then
|
||||
export JDK_HOME=${BROOT}/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 -b dev-java/openjdk-bin:${SLOT})
|
||||
[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
|
||||
JDK_HOME=${JDK_HOME#*/}
|
||||
JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*}
|
||||
export JDK_HOME
|
||||
fi
|
||||
|
||||
# Work around stack alignment issue, bug #647954. in case we ever have x86
|
||||
use x86 && append-flags -mincoming-stack-boundary=2
|
||||
|
||||
# bug 906987; append-cppflags doesnt work
|
||||
use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
|
||||
|
||||
# Strip some flags users may set, but should not. #818502
|
||||
filter-flags -fexceptions
|
||||
|
||||
# Strip lto related flags, we rely on --with-jvm-features=link-time-opt
|
||||
# See bug #833097 and bug #833098.
|
||||
#
|
||||
# .. but because of -Werror=odr (bug #916735), we disable it
|
||||
# entirely for now.
|
||||
#tc-is-lto && myconf+=( --with-jvm-features=link-time-opt )
|
||||
filter-lto
|
||||
filter-flags -fdevirtualize-at-ltrans
|
||||
|
||||
if use static-libs ; then
|
||||
lto-guarantee-fat
|
||||
fi
|
||||
|
||||
# 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.
|
||||
|
||||
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-stdc++lib=dynamic
|
||||
--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-jvm-feature-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" )
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
|
||||
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() {
|
||||
# Too brittle - gets confused by e.g. -Oline
|
||||
export MAKEOPTS="-j$(makeopts_jobs) -l$(makeopts_loadavg)"
|
||||
unset GNUMAKEFLAGS MAKEFLAGS
|
||||
|
||||
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)
|
||||
$(usev static-libs static-libs-image)
|
||||
)
|
||||
emake "${myemakeargs[@]}" -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
|
||||
local ddest="${ED}/${dest#/}"
|
||||
|
||||
# https://bugs.gentoo.org/922741
|
||||
docompress "${dest}/man"
|
||||
|
||||
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
|
||||
|
||||
java-vm_install-env "${FILESDIR}"/${PN}.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/*
|
||||
fi
|
||||
|
||||
if use static-libs ; then
|
||||
cd "${S}"/build/*-release/images/static-libs || die
|
||||
cp -pPR * "${ddest}" || die
|
||||
strip-lto-bytecode "${ddest}" || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
java-vm-2_pkg_postinst
|
||||
}
|
||||
Reference in New Issue
Block a user