diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.4.ebuild index 356bd10b87..52b264f3f7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.76.4.ebuild @@ -197,6 +197,17 @@ multilib_src_configure() { $(meson_native_use_feature elf libelf) -Dmultiarch=false ) + + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild index 356bd10b87..52b264f3f7 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.3.ebuild @@ -197,6 +197,17 @@ multilib_src_configure() { $(meson_native_use_feature elf libelf) -Dmultiarch=false ) + + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild index f3dbbeb1f1..6ae0c3800f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.4-r1.ebuild @@ -206,6 +206,17 @@ multilib_src_configure() { $(meson_native_use_feature elf libelf) -Dmultiarch=false ) + + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild index 4cb3fb6b75..004b9796f1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.78.6.ebuild @@ -205,6 +205,17 @@ multilib_src_configure() { $(meson_native_use_feature elf libelf) -Dmultiarch=false ) + + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.4.ebuild index 1a20959666..79fbaf94db 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.4.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/glib/glib-2.80.4.ebuild @@ -186,6 +186,7 @@ multilib_src_configure() { #fi use debug && EMESON_BUILD_TYPE=debug + local emesonargs=( -Ddefault_library=$(usex static-libs both shared) -Druntime_dir="${EPREFIX}"/run @@ -205,6 +206,17 @@ multilib_src_configure() { -Dmultiarch=false $(meson_native_use_feature introspection) ) + + # Workaround for bug #938302 + if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + meson_src_configure }