mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
Merge updates from master
This commit is contained in:
@@ -328,7 +328,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -327,7 +327,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -326,7 +326,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -327,7 +327,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -328,7 +328,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -328,7 +328,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -318,7 +318,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -319,7 +319,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -328,7 +328,7 @@ src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use dtrace && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use dtrace && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
local native_file="${T}"/meson.${CHOST}.ini.local
|
||||
cat >> ${native_file} <<-EOF || die
|
||||
[binaries]
|
||||
|
||||
@@ -452,7 +452,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -452,7 +452,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -452,7 +452,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -455,7 +455,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -456,7 +456,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -476,7 +476,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -476,7 +476,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -476,7 +476,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -480,7 +480,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -480,7 +480,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -479,7 +479,7 @@ src_prepare() {
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
[binaries]
|
||||
dtrace='stap-dtrace'
|
||||
|
||||
@@ -164,7 +164,7 @@ src_configure() {
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -178,7 +178,7 @@ src_configure() {
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ src_configure() {
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -141,7 +141,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -150,7 +150,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -160,7 +160,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -161,7 +161,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -162,7 +162,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -163,7 +163,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@ src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -199,7 +199,7 @@ multilib_src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
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]
|
||||
|
||||
@@ -199,7 +199,7 @@ multilib_src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
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]
|
||||
|
||||
@@ -208,7 +208,7 @@ multilib_src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
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]
|
||||
|
||||
@@ -207,7 +207,7 @@ multilib_src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
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]
|
||||
|
||||
@@ -208,7 +208,7 @@ multilib_src_configure() {
|
||||
)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
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]
|
||||
|
||||
@@ -164,7 +164,7 @@ src_configure() {
|
||||
local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
@@ -164,7 +164,7 @@ src_configure() {
|
||||
local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die)
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
export DTRACE="${BROOT}"/usr/bin/stap-dtrace
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user