commit: f7909a793ea72d41af9fdad6e9f2db77c51bd63a Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Thu Sep 19 02:27:14 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 19 03:00:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7909a79
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 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38678 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/openjdk/openjdk-11.0.24_p8.ebuild | 10 +++++----- dev-java/openjdk/openjdk-17.0.12_p7.ebuild | 10 +++++----- dev-java/openjdk/openjdk-21.0.4_p7.ebuild | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild index fdf4cbbec3a1..777fecd885e4 100644 --- a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild +++ b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild @@ -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 diff --git a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild index 46a240264a9a..ebee2f2cc50f 100644 --- a/dev-java/openjdk/openjdk-17.0.12_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.12_p7.ebuild @@ -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 diff --git a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild index 2d2f4a5ddf98..bb3ad26ff08a 100644 --- a/dev-java/openjdk/openjdk-21.0.4_p7.ebuild +++ b/dev-java/openjdk/openjdk-21.0.4_p7.ebuild @@ -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
