dev-java/openjdk: fix handle of systemtap without dtrace-symlink

openjdk accept DTRACE from command line instead of env, see jdk source line
297 of make/autoconf/util_paths.m4, otherwise build will failed:

 configure: WARNING: Ignoring value of DTRACE from the environment. Use command line variables instead.

Bug: https://bugs.gentoo.org/938302
Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38678
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Z. Liu
2024-09-19 10:27:14 +08:00
committed by Sam James
parent cbb8c04158
commit f7909a793e
3 changed files with 15 additions and 15 deletions

View File

@@ -163,11 +163,6 @@ 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
@@ -233,6 +228,11 @@ src_configure() {
fi
fi
# 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

View File

@@ -177,11 +177,6 @@ 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
@@ -242,6 +237,11 @@ src_configure() {
fi
fi
# Workaround for bug #938302
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
myconf+=( TRACE="${BROOT}"/usr/bin/stap-dtrace )
fi
if use !system-bootstrap ; then
addpredict /dev/random
addpredict /proc/self/coredump_filter

View File

@@ -175,11 +175,6 @@ 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
@@ -246,6 +241,11 @@ src_configure() {
fi
fi
# 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