mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
app-emulation/qemu: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
parent
a6dfaf6afe
commit
b1947cb2c5
@ -1,25 +0,0 @@
|
|||||||
Do not use system's 'qemu-keymap' in native case.
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -337,6 +337,8 @@ if 'CONFIG_LIBCAP_NG' in config_host
|
|
||||||
endif
|
|
||||||
if get_option('xkbcommon').auto() and not have_system and not have_tools
|
|
||||||
xkbcommon = not_found
|
|
||||||
+elif get_option('xkbcommon').disabled()
|
|
||||||
+ xkbcommon = not_found
|
|
||||||
else
|
|
||||||
xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
|
|
||||||
method: 'pkg-config', static: enable_static)
|
|
||||||
--- a/pc-bios/keymaps/meson.build
|
|
||||||
+++ b/pc-bios/keymaps/meson.build
|
|
||||||
@@ -33,7 +33,9 @@ keymaps = {
|
|
||||||
'tr': '-l tr',
|
|
||||||
}
|
|
||||||
|
|
||||||
-if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in config_host
|
|
||||||
+if meson.is_cross_build()
|
|
||||||
native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true)
|
|
||||||
+elif get_option('xkbcommon').disabled()
|
|
||||||
+ native_qemu_keymap = not_found
|
|
||||||
else
|
|
||||||
native_qemu_keymap = qemu_keymap
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
Allow MAKE='make V=1' and similar.
|
|
||||||
|
|
||||||
https://bugs.gentoo.org/795678
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -1953,7 +1953,7 @@ if test -z "$python"
|
|
||||||
then
|
|
||||||
error_exit "Python not found. Use --python=/path/to/python"
|
|
||||||
fi
|
|
||||||
-if ! has "$make"
|
|
||||||
+if ! has $make
|
|
||||||
then
|
|
||||||
error_exit "GNU make ($make) not found"
|
|
||||||
fi
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001
|
|
||||||
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
|
|
||||||
---
|
|
||||||
meson.build | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 65a885ea69..29ce7a5a8e 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -1684,7 +1684,7 @@ have_virtfs = get_option('virtfs') \
|
|
||||||
.disable_auto_if(not have_tools and not have_system) \
|
|
||||||
.allowed()
|
|
||||||
|
|
||||||
-have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools
|
|
||||||
+have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found()
|
|
||||||
|
|
||||||
if get_option('block_drv_ro_whitelist') == ''
|
|
||||||
config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '')
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
Forward ported from qemu-2.11.1-capstone_include_path.patch.
|
|
||||||
This time also fix the capstone.h header check to use the path we're
|
|
||||||
already patching in.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/873157
|
|
||||||
diff --git a/include/disas/capstone.h b/include/disas/capstone.h
|
|
||||||
index e29068dd97..d8fdc5d537 100644
|
|
||||||
--- a/include/disas/capstone.h
|
|
||||||
+++ b/include/disas/capstone.h
|
|
||||||
@@ -3,7 +3,7 @@
|
|
||||||
|
|
||||||
#ifdef CONFIG_CAPSTONE
|
|
||||||
|
|
||||||
-#include <capstone.h>
|
|
||||||
+#include <capstone/capstone.h>
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 20fddbd707..50ce96bbd1 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -2605,7 +2605,7 @@ if not get_option('capstone').auto() or have_system or have_user
|
|
||||||
# that reports a wrong -I path, causing the #include to
|
|
||||||
# fail later. If the system has such a broken version
|
|
||||||
# do not use it.
|
|
||||||
- if capstone.found() and not cc.compiles('#include <capstone.h>',
|
|
||||||
+ if capstone.found() and not cc.compiles('#include <capstone/capstone.h>',
|
|
||||||
dependencies: [capstone])
|
|
||||||
capstone = not_found
|
|
||||||
if get_option('capstone').enabled()
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
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')
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index c44d05a13..5c5c09894 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -671,6 +671,8 @@ endif
|
|
||||||
|
|
||||||
if get_option('xkbcommon').auto() and not have_system and not have_tools
|
|
||||||
xkbcommon = not_found
|
|
||||||
+elif get_option('xkbcommon').disabled()
|
|
||||||
+ xkbcommon = not_found
|
|
||||||
else
|
|
||||||
xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
|
|
||||||
method: 'pkg-config', kwargs: static_kwargs)
|
|
||||||
diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build
|
|
||||||
index 158a3b410..3bb318a23 100644
|
|
||||||
--- a/pc-bios/keymaps/meson.build
|
|
||||||
+++ b/pc-bios/keymaps/meson.build
|
|
||||||
@@ -33,8 +33,10 @@ keymaps = {
|
|
||||||
'tr': '-l tr',
|
|
||||||
}
|
|
||||||
|
|
||||||
-if meson.is_cross_build() or not xkbcommon.found()
|
|
||||||
+if meson.is_cross_build()
|
|
||||||
native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true)
|
|
||||||
+elif get_option('xkbcommon').disabled()
|
|
||||||
+ native_qemu_keymap = not_found
|
|
||||||
else
|
|
||||||
native_qemu_keymap = qemu_keymap
|
|
||||||
endif
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
From d02ea89239768c93651a161d057f2bf04d56a024 Mon Sep 17 00:00:00 2001
|
|
||||||
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
|
|
||||||
---
|
|
||||||
meson.build | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 063c736aee..fda8639293 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -2008,8 +2008,6 @@ have_virtfs = get_option('virtfs') \
|
|
||||||
.allowed()
|
|
||||||
|
|
||||||
have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \
|
|
||||||
- .require(targetos != '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.35.1
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user