forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
app-emulation/libvirt-6.8.0: Properly handle libpcap if it's explicit…
…ly disabled This is a direct backport of an upstream commit of: c8be9ccc36a32cc756d05b2c0838c43a57be15f7 It was merged in 6.9.0 release, so 6.8.0 is the only release which is still buggy. Resolves: https://bugs.gentoo.org/754888 Signed-off-by: Michal Privoznik <[email protected]> Closes: gentoo#18536 Signed-off-by: Sergei Trofimovich <[email protected]>
- Loading branch information
Showing
2 changed files
with
57 additions
and
0 deletions.
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
...on/libvirt/files/libvirt-6.8.0-meson-properly-handle-libpcap-if-it-s-explicitly-dis.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
From c8be9ccc36a32cc756d05b2c0838c43a57be15f7 Mon Sep 17 00:00:00 2001 | ||
Message-Id: <c8be9ccc36a32cc756d05b2c0838c43a57be15f7.1607284606.git.mprivozn@redhat.com> | ||
From: Pavel Hrdina <[email protected]> | ||
Date: Thu, 8 Oct 2020 13:09:45 +0200 | ||
Subject: [PATCH] meson: properly handle libpcap if it's explicitly disabled | ||
|
||
If libpcap is detected using pkg-config it would ignore the libpcap | ||
option. | ||
|
||
Signed-off-by: Pavel Hrdina <[email protected]> | ||
Reviewed-by: Andrea Bolognani <[email protected]> | ||
Signed-off-by: Michal Privoznik <[email protected]> | ||
--- | ||
meson.build | 25 +++++++++++++++---------- | ||
1 file changed, 15 insertions(+), 10 deletions(-) | ||
|
||
diff --git a/meson.build b/meson.build | ||
index e5a8316668..ec252ddf39 100644 | ||
--- a/meson.build | ||
+++ b/meson.build | ||
@@ -1101,17 +1101,22 @@ if libparted_dep.found() | ||
endif | ||
|
||
libpcap_version = '1.5.0' | ||
-libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false) | ||
-if not libpcap_dep.found() | ||
- pcap_config_prog = find_program('pcap-config', required: get_option('libpcap')) | ||
- if pcap_config_prog.found() | ||
- pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split() | ||
- pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split() | ||
- libpcap_dep = declare_dependency( | ||
- compile_args: pcap_args, | ||
- link_args: pcap_libs, | ||
- ) | ||
+if not get_option('libpcap').disabled() | ||
+ libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false) | ||
+ | ||
+ if not libpcap_dep.found() | ||
+ pcap_config_prog = find_program('pcap-config', required: get_option('libpcap')) | ||
+ if pcap_config_prog.found() | ||
+ pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split() | ||
+ pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split() | ||
+ libpcap_dep = declare_dependency( | ||
+ compile_args: pcap_args, | ||
+ link_args: pcap_libs, | ||
+ ) | ||
+ endif | ||
endif | ||
+else | ||
+ libpcap_dep = dependency('', required: false) | ||
endif | ||
if libpcap_dep.found() | ||
conf.set('WITH_LIBPCAP', 1) | ||
-- | ||
2.26.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters