mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-25 15:41:04 +02:00
dev-libs/glib: Sync with Gentoo
It's from Gentoo commit e0d489eeab243a77861cd19266d7e6869e833f5f.
This commit is contained in:
parent
acddc33f83
commit
b8c243322f
@ -197,6 +197,17 @@ multilib_src_configure() {
|
|||||||
$(meson_native_use_feature elf libelf)
|
$(meson_native_use_feature elf libelf)
|
||||||
-Dmultiarch=false
|
-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
|
meson_src_configure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -197,6 +197,17 @@ multilib_src_configure() {
|
|||||||
$(meson_native_use_feature elf libelf)
|
$(meson_native_use_feature elf libelf)
|
||||||
-Dmultiarch=false
|
-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
|
meson_src_configure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -206,6 +206,17 @@ multilib_src_configure() {
|
|||||||
$(meson_native_use_feature elf libelf)
|
$(meson_native_use_feature elf libelf)
|
||||||
-Dmultiarch=false
|
-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
|
meson_src_configure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,6 +205,17 @@ multilib_src_configure() {
|
|||||||
$(meson_native_use_feature elf libelf)
|
$(meson_native_use_feature elf libelf)
|
||||||
-Dmultiarch=false
|
-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
|
meson_src_configure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -186,6 +186,7 @@ multilib_src_configure() {
|
|||||||
#fi
|
#fi
|
||||||
|
|
||||||
use debug && EMESON_BUILD_TYPE=debug
|
use debug && EMESON_BUILD_TYPE=debug
|
||||||
|
|
||||||
local emesonargs=(
|
local emesonargs=(
|
||||||
-Ddefault_library=$(usex static-libs both shared)
|
-Ddefault_library=$(usex static-libs both shared)
|
||||||
-Druntime_dir="${EPREFIX}"/run
|
-Druntime_dir="${EPREFIX}"/run
|
||||||
@ -205,6 +206,17 @@ multilib_src_configure() {
|
|||||||
-Dmultiarch=false
|
-Dmultiarch=false
|
||||||
$(meson_native_use_feature introspection)
|
$(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
|
meson_src_configure
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user