mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-12 00:07:12 +03:00
d6f20b2493
Because we want to download all dependencies in fetch phase (fixed in [1]), we keep a list of subprojects among with their latest commit hash. Well, in commit [2] qemu bumped 'berkeley-testfloat-3'. Reflect that in our live ebuild. Unfortunately, I've missed this in qemu-8.2.0 timeframe (in which the qemu commit was merged), but there's no real harm as these subprojects are part of dist tar. IOW, it's only live ebuild that needs to fetch subprojects explicitly. Also, some patches don't apply cleanly anymore. Rebase them. Oh, and 'nios2' target was removed [3]. 1: https://github.com/gentoo/gentoo/pull/32684 2:c01196bddd3:6c3014858cSigned-off-by: Michal Privoznik <michal.privoznik@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 951325a0c9519d4910d80cc6c7a5728c0dbc4946 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <951325a0c9519d4910d80cc6c7a5728c0dbc4946.1714317553.git.mprivozn@redhat.com>
|
|
From: Matthias Maier <tamiko@43-1.org>
|
|
Date: Mon, 4 Apr 2022 12:56:59 +0200
|
|
Subject: [PATCH] also build virtfs-proxy-helper
|
|
|
|
The Gentoo ebuild splits the qemu build into a softmmu, user and tool
|
|
phase in order to be able to build and link some of the qemu emulators
|
|
statically. This unfortunately has the consequence that we never
|
|
configure with "have_virtfs" and "have_tools" at the same time.
|
|
|
|
As a workaround, simply build the virtfs userland unconditionally. After
|
|
all, it is a tiny executable.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
meson.build | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index c3a2be7b2d..50a5cfcf4e 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -2116,8 +2116,6 @@ have_virtfs = get_option('virtfs') \
|
|
.allowed()
|
|
|
|
have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \
|
|
- .require(host_os != 'darwin', error_message: 'the virtfs proxy helper is incompatible with macOS') \
|
|
- .require(have_virtfs, error_message: 'the virtfs proxy helper requires that virtfs is enabled') \
|
|
.disable_auto_if(not have_tools) \
|
|
.require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \
|
|
.allowed()
|
|
--
|
|
2.43.2
|
|
|