| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame^] | 1 | From 3e271f6db12ffe34843428ec2f0bca7a8fe3aa65 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> |
| 3 | Date: Wed, 8 Apr 2015 13:03:03 -0400 |
| 4 | Subject: [PATCH] libvirt: use pkg-config to locate libcap |
| 5 | |
| 6 | libvirt wants to use pcap-config to locate the exisence and location |
| 7 | of libpcap. oe-core stubs this script and replaces it with pkg-config, |
| 8 | which can lead to the host pcap-config triggering and either breaking |
| 9 | the build or introducing host contamination. |
| 10 | |
| 11 | To fix this issue, we patch configure to use 'pkg-config libcap' to |
| 12 | locate the correct libraries. |
| 13 | |
| 14 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
| 15 | --- |
| 16 | configure.ac | 6 +++--- |
| 17 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index f37047599b76..5f9b84363b96 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -1553,7 +1553,7 @@ fi |
| 24 | AM_CONDITIONAL([HAVE_NUMAD], [test "$with_numad" != "no"]) |
| 25 | |
| 26 | dnl pcap lib |
| 27 | -LIBPCAP_CONFIG="pcap-config" |
| 28 | +LIBPCAP_CONFIG="pkg-config libpcap" |
| 29 | LIBPCAP_CFLAGS="" |
| 30 | LIBPCAP_LIBS="" |
| 31 | LIBPCAP_FOUND="no" |
| 32 | @@ -1563,8 +1563,8 @@ AC_ARG_WITH([libpcap], [AS_HELP_STRING([--with-libpcap=@<:@PFX@:>@], |
| 33 | if test "$with_qemu" = "yes"; then |
| 34 | case $with_libpcap in |
| 35 | no) LIBPCAP_CONFIG= ;; |
| 36 | - ''|yes) LIBPCAP_CONFIG="pcap-config" ;; |
| 37 | - *) LIBPCAP_CONFIG="$with_libpcap/bin/pcap-config" ;; |
| 38 | + ''|yes) LIBPCAP_CONFIG="pkg-config libpcap" ;; |
| 39 | + *) LIBPCAP_CONFIG="$with_libpcap/bin/pkg-config libpcap" ;; |
| 40 | esac |
| 41 | AS_IF([test "x$LIBPCAP_CONFIG" != "x"], [ |
| 42 | AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED ) |
| 43 | -- |
| 44 | 2.1.0 |
| 45 | |