summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2024-08-31 03:39:51 +0100
committerSam James <sam@gentoo.org>2024-08-31 03:49:07 +0100
commit3ad9bec27d191027a12175cb78aac69582208494 (patch)
treec0266d09d02d48014f715e45f0f54f4e22566a40
parentdev-libs/glib: handle dev-debug/systemtap[-dtrace-symlink] (diff)
downloadgentoo-3ad9bec27d191027a12175cb78aac69582208494.tar.gz
gentoo-3ad9bec27d191027a12175cb78aac69582208494.tar.bz2
gentoo-3ad9bec27d191027a12175cb78aac69582208494.zip
dev-java/openjdk: handle dev-debug/systemtap[-dtrace-symlink]
See efb3a82e3496d3a52a1d04d4cbdb83b25655d96a. Bug: https://bugs.gentoo.org/938302 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-java/openjdk/openjdk-11.0.24_p8.ebuild5
-rw-r--r--dev-java/openjdk/openjdk-17.0.12_p7.ebuild5
-rw-r--r--dev-java/openjdk/openjdk-21.0.4_p7.ebuild5
3 files changed, 15 insertions, 0 deletions
diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
index 7b836738329f..73935ecc1856 100644
--- a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild
@@ -163,6 +163,11 @@ src_configure() {
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
fi
+ # Workaround for bug #938302
+ if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+ export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+ fi
+
# Work around stack alignment issue, bug #647954.
use x86 && append-flags -mincoming-stack-boundary=2
diff --git a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
index 0bd209de601f..b871b4d9db1a 100644
--- a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild
@@ -177,6 +177,11 @@ src_configure() {
export JDK_HOME
fi
+ # Workaround for bug #938302
+ if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+ export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+ fi
+
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2
diff --git a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
index 2fe2a993eaea..4aee5fefa417 100644
--- a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
+++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild
@@ -175,6 +175,11 @@ src_configure() {
export JDK_HOME
fi
+ # Workaround for bug #938302
+ if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+ export DTRACE="${BROOT}"/usr/bin/stap-dtrace
+ fi
+
# Work around stack alignment issue, bug #647954. in case we ever have x86
use x86 && append-flags -mincoming-stack-boundary=2