From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1371B158083 for ; Thu, 19 Sep 2024 03:01:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16588E29A5; Thu, 19 Sep 2024 03:01:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFDF6E29A5 for ; Thu, 19 Sep 2024 03:00:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C03E33BE32 for ; Thu, 19 Sep 2024 03:00:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81BBB2670 for ; Thu, 19 Sep 2024 03:00:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1726714810.f7909a793ea72d41af9fdad6e9f2db77c51bd63a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk/openjdk-11.0.24_p8.ebuild dev-java/openjdk/openjdk-17.0.12_p7.ebuild dev-java/openjdk/openjdk-21.0.4_p7.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f7909a793ea72d41af9fdad6e9f2db77c51bd63a X-VCS-Branch: master Date: Thu, 19 Sep 2024 03:00:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8303f42-6d30-4cac-a593-45aacadaabc2 X-Archives-Hash: bd80191e8542926d824a76bb0071f26f commit: f7909a793ea72d41af9fdad6e9f2db77c51bd63a Author: Z. Liu gmail com> AuthorDate: Thu Sep 19 02:27:14 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38678 Signed-off-by: Sam James 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