mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
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:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user