diff --git a/dev-java/openjdk/openjdk-11.0.24_p8.ebuild b/dev-java/openjdk/openjdk-11.0.24_p8.ebuild index 7b836738329fa..73935ecc1856e 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 0bd209de601f7..b871b4d9db1a4 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 2fe2a993eaea1..4aee5fefa4176 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 diff --git a/dev-lang/ruby/ruby-3.1.4-r3.ebuild b/dev-lang/ruby/ruby-3.1.4-r3.ebuild index c75cb26915d4b..e4a60e643913c 100644 --- a/dev-lang/ruby/ruby-3.1.4-r3.ebuild +++ b/dev-lang/ruby/ruby-3.1.4-r3.ebuild @@ -140,6 +140,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.1.5.ebuild b/dev-lang/ruby/ruby-3.1.5.ebuild index 7c501cfa9b7f2..09b8eed003fce 100644 --- a/dev-lang/ruby/ruby-3.1.5.ebuild +++ b/dev-lang/ruby/ruby-3.1.5.ebuild @@ -149,6 +149,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.1.6-r1.ebuild b/dev-lang/ruby/ruby-3.1.6-r1.ebuild index 8ee6c384862be..5317d35b0fe19 100644 --- a/dev-lang/ruby/ruby-3.1.6-r1.ebuild +++ b/dev-lang/ruby/ruby-3.1.6-r1.ebuild @@ -159,6 +159,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.2.3.ebuild b/dev-lang/ruby/ruby-3.2.3.ebuild index 1acabf564cb0e..defcbe17bb805 100644 --- a/dev-lang/ruby/ruby-3.2.3.ebuild +++ b/dev-lang/ruby/ruby-3.2.3.ebuild @@ -160,6 +160,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.2.4-r1.ebuild b/dev-lang/ruby/ruby-3.2.4-r1.ebuild index 9a34253b72867..e9eeab6720c36 100644 --- a/dev-lang/ruby/ruby-3.2.4-r1.ebuild +++ b/dev-lang/ruby/ruby-3.2.4-r1.ebuild @@ -165,6 +165,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.2.4.ebuild b/dev-lang/ruby/ruby-3.2.4.ebuild index b6930b6a74e10..29eafa112bc84 100644 --- a/dev-lang/ruby/ruby-3.2.4.ebuild +++ b/dev-lang/ruby/ruby-3.2.4.ebuild @@ -161,6 +161,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.2.5.ebuild b/dev-lang/ruby/ruby-3.2.5.ebuild index cbd46d6f96c40..d7e52fe863228 100644 --- a/dev-lang/ruby/ruby-3.2.5.ebuild +++ b/dev-lang/ruby/ruby-3.2.5.ebuild @@ -165,6 +165,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.3.2.ebuild b/dev-lang/ruby/ruby-3.3.2.ebuild index 02b05be1c6ca8..e6bcd9a7151c1 100644 --- a/dev-lang/ruby/ruby-3.3.2.ebuild +++ b/dev-lang/ruby/ruby-3.3.2.ebuild @@ -162,6 +162,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.3.4-r1.ebuild b/dev-lang/ruby/ruby-3.3.4-r1.ebuild index 0ef34173c25d4..0e86f0e2350b3 100644 --- a/dev-lang/ruby/ruby-3.3.4-r1.ebuild +++ b/dev-lang/ruby/ruby-3.3.4-r1.ebuild @@ -168,6 +168,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-lang/ruby/ruby-3.3.4.ebuild b/dev-lang/ruby/ruby-3.3.4.ebuild index e96e95a64f16e..a85d9608d0bb4 100644 --- a/dev-lang/ruby/ruby-3.3.4.ebuild +++ b/dev-lang/ruby/ruby-3.3.4.ebuild @@ -167,6 +167,11 @@ src_configure() { # as it's risky with newer compilers to leave it as it is. append-flags -fno-strict-aliasing + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + export DTRACE="${BROOT}"/usr/bin/stap-dtrace + fi + # Socks support via dante if use socks5 ; then # Socks support can't be disabled as long as SOCKS_SERVER is diff --git a/dev-libs/glib/glib-2.76.4.ebuild b/dev-libs/glib/glib-2.76.4.ebuild index 356bd10b8796b..f296a348fdf3c 100644 --- a/dev-libs/glib/glib-2.76.4.ebuild +++ b/dev-libs/glib/glib-2.76.4.ebuild @@ -178,7 +178,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" -Dbuildtype=$(usex debug debug plain) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.78.3.ebuild b/dev-libs/glib/glib-2.78.3.ebuild index 356bd10b8796b..f296a348fdf3c 100644 --- a/dev-libs/glib/glib-2.78.3.ebuild +++ b/dev-libs/glib/glib-2.78.3.ebuild @@ -178,7 +178,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" -Dbuildtype=$(usex debug debug plain) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.78.4-r1.ebuild b/dev-libs/glib/glib-2.78.4-r1.ebuild index f3dbbeb1f18b7..07caf94eb0dcc 100644 --- a/dev-libs/glib/glib-2.78.4-r1.ebuild +++ b/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -187,7 +187,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.78.6.ebuild b/dev-libs/glib/glib-2.78.6.ebuild index 4cb3fb6b75e4a..19ae0fc69d73a 100644 --- a/dev-libs/glib/glib-2.78.6.ebuild +++ b/dev-libs/glib/glib-2.78.6.ebuild @@ -186,7 +186,17 @@ multilib_src_configure() { #esac #fi + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" $(meson_feature debug glib_debug) -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run diff --git a/dev-libs/glib/glib-2.80.4.ebuild b/dev-libs/glib/glib-2.80.4.ebuild index 1a20959666c28..2d87ba9d7a691 100644 --- a/dev-libs/glib/glib-2.80.4.ebuild +++ b/dev-libs/glib/glib-2.80.4.ebuild @@ -186,7 +186,18 @@ multilib_src_configure() { #fi use debug && EMESON_BUILD_TYPE=debug + + local native_file="${T}"/meson.${CHOST}.ini.local + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + fi + local emesonargs=( + --native-file "${native_file}" -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run $(meson_feature selinux)