mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-10 06:26:57 +02:00
app-emulation/qemu: Sync with Gentoo
It's from Gentoo commit 11f27b8f7e74a1eeab974b523ff2622fde7f9908.
This commit is contained in:
parent
59829090bd
commit
0cdf900d88
@ -47,7 +47,7 @@
|
|||||||
<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
|
<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
|
||||||
<flag name="static-user">Build the User targets as static binaries</flag>
|
<flag name="static-user">Build the User targets as static binaries</flag>
|
||||||
<flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag>
|
<flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag>
|
||||||
<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
|
<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
|
||||||
<flag name="jemalloc">Enable jemalloc allocator support</flag>
|
<flag name="jemalloc">Enable jemalloc allocator support</flag>
|
||||||
<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
|
<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
|
||||||
<flag name="png">Enable png image support for the VNC console server</flag>
|
<flag name="png">Enable png image support for the VNC console server</flag>
|
||||||
|
@ -451,6 +451,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -660,7 +668,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -451,6 +451,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -660,7 +668,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -451,6 +451,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -660,7 +668,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -454,6 +454,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -661,7 +669,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -455,6 +455,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -661,7 +669,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -475,6 +475,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -681,7 +689,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -475,6 +475,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -681,7 +689,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -475,6 +475,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -681,7 +689,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -479,6 +479,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -685,7 +693,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -479,6 +479,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -685,7 +693,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
@ -478,6 +478,14 @@ src_prepare() {
|
|||||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||||
export WINDRES=${CHOST}-windres
|
export WINDRES=${CHOST}-windres
|
||||||
|
|
||||||
|
# Workaround for bug #938302
|
||||||
|
if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
|
||||||
|
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||||
|
[binaries]
|
||||||
|
dtrace='stap-dtrace'
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
# Verbose builds
|
# Verbose builds
|
||||||
MAKEOPTS+=" V=1"
|
MAKEOPTS+=" V=1"
|
||||||
|
|
||||||
@ -684,7 +692,7 @@ qemu_src_configure() {
|
|||||||
local targets="${buildtype}_targets"
|
local targets="${buildtype}_targets"
|
||||||
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
|
||||||
|
|
||||||
# Add support for SystemTAP
|
# Add support for SystemTap
|
||||||
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
# We always want to attempt to build with PIE support as it results
|
||||||
|
Loading…
Reference in New Issue
Block a user