mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
app-emulation/qemu: Sync with Gentoo
It's from Gentoo commit 0625619dc2e394a1bd3714bee810b8c003e4870e.
This commit is contained in:
parent
21f45a1226
commit
68ef6dd0bd
@ -18,7 +18,7 @@ PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
|
||||
|
||||
FIRMWARE_ABI_VERSION="7.2.0"
|
||||
|
||||
inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
|
||||
inherit flag-o-matic linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
|
||||
pax-utils xdg-utils
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
@ -66,7 +66,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
|
||||
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
|
||||
+slirp
|
||||
smartcard snappy spice ssh static-user systemtap test udev usb
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte xattr xdp xen
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
|
||||
zstd"
|
||||
|
||||
COMMON_TARGETS="
|
||||
@ -185,7 +185,7 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
dev-libs/nettle:=[static-libs(+)]
|
||||
)
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/gtk+:3[wayland?,X?]
|
||||
vte? ( x11-libs/vte:2.91 )
|
||||
)
|
||||
infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
|
||||
@ -480,6 +480,10 @@ src_prepare() {
|
||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# defang automagic dependencies
|
||||
use X || append-cppflags -DGENTOO_GTK_HIDE_X11
|
||||
use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
@ -18,7 +18,7 @@ PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
|
||||
|
||||
FIRMWARE_ABI_VERSION="7.2.0"
|
||||
|
||||
inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
|
||||
inherit flag-o-matic linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \
|
||||
pax-utils xdg-utils
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
@ -66,7 +66,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
|
||||
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
|
||||
+slirp
|
||||
smartcard snappy spice ssh static-user systemtap test udev usb
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte xattr xdp xen
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
|
||||
zstd"
|
||||
|
||||
COMMON_TARGETS="
|
||||
@ -185,7 +185,7 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
dev-libs/nettle:=[static-libs(+)]
|
||||
)
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/gtk+:3[wayland?,X?]
|
||||
vte? ( x11-libs/vte:2.91 )
|
||||
)
|
||||
infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
|
||||
@ -480,6 +480,10 @@ src_prepare() {
|
||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# defang automagic dependencies
|
||||
use X || append-cppflags -DGENTOO_GTK_HIDE_X11
|
||||
use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
@ -288,8 +288,9 @@ BDEPEND="
|
||||
)
|
||||
gtk? ( nls? ( sys-devel/gettext ) )
|
||||
test? (
|
||||
dev-libs/glib[utils]
|
||||
app-alternatives/bc
|
||||
dev-libs/glib[utils]
|
||||
dev-python/pycotap[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
CDEPEND="
|
||||
|
||||
@ -18,7 +18,7 @@ PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
|
||||
|
||||
FIRMWARE_ABI_VERSION="7.2.0"
|
||||
|
||||
inherit eapi9-ver linux-info toolchain-funcs python-r1 udev fcaps \
|
||||
inherit eapi9-ver flag-o-matic linux-info toolchain-funcs python-r1 udev fcaps \
|
||||
readme.gentoo-r1 pax-utils xdg-utils
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
@ -66,7 +66,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
|
||||
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
|
||||
+slirp
|
||||
smartcard snappy spice ssh static-user systemtap test udev usb
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte xattr xdp xen
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
|
||||
zstd"
|
||||
|
||||
COMMON_TARGETS="
|
||||
@ -184,7 +184,7 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
dev-libs/nettle:=[static-libs(+)]
|
||||
)
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/gtk+:3[wayland?,X?]
|
||||
vte? ( x11-libs/vte:2.91 )
|
||||
)
|
||||
infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
|
||||
@ -288,8 +288,9 @@ BDEPEND="
|
||||
)
|
||||
gtk? ( nls? ( sys-devel/gettext ) )
|
||||
test? (
|
||||
dev-libs/glib[utils]
|
||||
app-alternatives/bc
|
||||
dev-libs/glib[utils]
|
||||
dev-python/pycotap[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
CDEPEND="
|
||||
@ -477,6 +478,10 @@ src_prepare() {
|
||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# defang automagic dependencies
|
||||
use X || append-flags -DGENTOO_GTK_HIDE_X11
|
||||
use wayland || append-flags -DGENTOO_GTK_HIDE_WAYLAND
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
@ -18,7 +18,7 @@ PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
|
||||
|
||||
FIRMWARE_ABI_VERSION="7.2.0"
|
||||
|
||||
inherit eapi9-ver linux-info toolchain-funcs python-r1 udev fcaps \
|
||||
inherit eapi9-ver flag-o-matic linux-info toolchain-funcs python-r1 udev fcaps \
|
||||
readme.gentoo-r1 pax-utils xdg-utils
|
||||
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
@ -66,7 +66,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
|
||||
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
|
||||
+slirp
|
||||
smartcard snappy spice ssh static-user systemtap test udev usb
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte xattr xdp xen
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
|
||||
zstd"
|
||||
|
||||
COMMON_TARGETS="
|
||||
@ -184,7 +184,7 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
dev-libs/nettle:=[static-libs(+)]
|
||||
)
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/gtk+:3[wayland?,X?]
|
||||
vte? ( x11-libs/vte:2.91 )
|
||||
)
|
||||
infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
|
||||
@ -288,8 +288,9 @@ BDEPEND="
|
||||
)
|
||||
gtk? ( nls? ( sys-devel/gettext ) )
|
||||
test? (
|
||||
dev-libs/glib[utils]
|
||||
app-alternatives/bc
|
||||
dev-libs/glib[utils]
|
||||
dev-python/pycotap[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
CDEPEND="
|
||||
@ -477,6 +478,10 @@ src_prepare() {
|
||||
tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
|
||||
export WINDRES=${CHOST}-windres
|
||||
|
||||
# defang automagic dependencies
|
||||
use X || append-flags -DGENTOO_GTK_HIDE_X11
|
||||
use wayland || append-flags -DGENTOO_GTK_HIDE_WAYLAND
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user