mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-14 16:37:01 +02:00
app-emulation/qemu: Sync with Gentoo
It's from Gentoo commit 74b06a127f862d7db58d1686fb8482644dc22a64.
This commit is contained in:
parent
9117f270c7
commit
7b643fa615
@ -0,0 +1,45 @@
|
||||
commit 433c2acd1b9c3f7f5903273e85fed9a7f9157b23
|
||||
Author: John Helmert III <ajak@gentoo.org>
|
||||
Date: Wed Jan 4 12:25:08 2023 -0600
|
||||
|
||||
meson.build: disable gmp
|
||||
|
||||
gmp isn't required, and we want to avoid linking to it automatigcally
|
||||
in Gentoo.
|
||||
|
||||
Bug: https://bugs.gentoo.org/886207
|
||||
Signed-off-by: John Helmert III <ajak@gentoo.org>
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 5c6b5a1c75..2f9550362d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1234,15 +1234,6 @@ if not gnutls_crypto.found()
|
||||
endif
|
||||
endif
|
||||
|
||||
-gmp = dependency('gmp', required: false, method: 'pkg-config', kwargs: static_kwargs)
|
||||
-if nettle.found() and gmp.found()
|
||||
- hogweed = dependency('hogweed', version: '>=3.4',
|
||||
- method: 'pkg-config',
|
||||
- required: get_option('nettle'),
|
||||
- kwargs: static_kwargs)
|
||||
-endif
|
||||
-
|
||||
-
|
||||
gtk = not_found
|
||||
gtkx11 = not_found
|
||||
vte = not_found
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 4b749ca549..e06b274960 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -277,6 +277,8 @@ option('vduse_blk_export', type: 'feature', value: 'auto',
|
||||
|
||||
option('capstone', type: 'feature', value: 'auto',
|
||||
description: 'Whether and how to find the capstone library')
|
||||
+option('gmp', type: 'feature', value: 'auto',
|
||||
+ description: 'Whether or not to find the gmp library')
|
||||
option('fdt', type: 'combo', value: 'auto',
|
||||
choices: ['disabled', 'enabled', 'auto', 'system', 'internal'],
|
||||
description: 'Whether and how to find the libfdt library')
|
@ -41,7 +41,7 @@ else
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
# [[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
@ -151,7 +151,7 @@ done
|
||||
# respected). This is because qemu supports using the C library's API
|
||||
# when available rather than always using the external library.
|
||||
ALL_DEPEND="
|
||||
>=dev-libs/glib-2.0[static-libs(+)]
|
||||
dev-libs/glib:2[static-libs(+)]
|
||||
sys-libs/zlib[static-libs(+)]
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
systemtap? ( dev-util/systemtap )
|
||||
@ -176,11 +176,14 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
|
||||
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
|
||||
gnutls? (
|
||||
dev-libs/nettle:=[static-libs(+)]
|
||||
>=net-libs/gnutls-3.0:=[static-libs(+)]
|
||||
dev-libs/nettle:=[static-libs(+)]
|
||||
)
|
||||
gtk? (
|
||||
x11-libs/cairo
|
||||
x11-libs/gdk-pixbuf:2
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libX11
|
||||
vte? ( x11-libs/vte:2.91 )
|
||||
)
|
||||
infiniband? ( sys-cluster/rdma-core[static-libs(+)] )
|
||||
@ -205,7 +208,7 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
)
|
||||
pam? ( sys-libs/pam )
|
||||
png? ( media-libs/libpng:0=[static-libs(+)] )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
pulseaudio? ( media-libs/libpulse )
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
|
||||
sdl? (
|
||||
@ -223,7 +226,7 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
)
|
||||
ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
|
||||
udev? ( virtual/libudev:= )
|
||||
usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
|
||||
usb? ( >=virtual/libusb-1-r2:1[static-libs(+)] )
|
||||
usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
|
||||
vde? ( net-misc/vde[static-libs(+)] )
|
||||
virgl? ( media-libs/virglrenderer[static-libs(+)] )
|
||||
@ -311,6 +314,7 @@ PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.0.0-make.patch
|
||||
"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
|
||||
"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
|
||||
"${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch
|
||||
)
|
||||
|
||||
QA_PREBUILT="
|
||||
|
@ -41,7 +41,7 @@ else
|
||||
fi
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
[[ "${PV}" != *_rc* ]] && KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86"
|
||||
[[ "${PV}" != *_rc* ]] && KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
|
@ -205,7 +205,7 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
media-libs/mesa[egl(+),gbm(+)]
|
||||
)
|
||||
pam? ( sys-libs/pam )
|
||||
png? ( media-libs/libpng:0=[static-libs(+)] )
|
||||
png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
|
||||
@ -219,8 +219,8 @@ SOFTMMU_TOOLS_DEPEND="
|
||||
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
|
||||
snappy? ( app-arch/snappy:= )
|
||||
spice? (
|
||||
>=app-emulation/spice-protocol-0.12.3
|
||||
>=app-emulation/spice-0.12.0[static-libs(+)]
|
||||
>=app-emulation/spice-protocol-0.14.0
|
||||
>=app-emulation/spice-0.14.0[static-libs(+)]
|
||||
)
|
||||
ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
|
||||
udev? ( virtual/libudev:= )
|
||||
|
Loading…
Reference in New Issue
Block a user