Changeset View
Changeset View
Standalone View
Standalone View
emulators/qemu-utils/files/patch-configure
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- configure.orig 2016-08-17 15:26:51 UTC | |||||
+++ configure | |||||
@@ -245,7 +245,7 @@ DSOSUF=".so" | |||||
LDFLAGS_SHARED="-shared" | |||||
modules="no" | |||||
prefix="/usr/local" | |||||
-mandir="\${prefix}/share/man" | |||||
+mandir="\${prefix}/man" | |||||
datadir="\${prefix}/share" | |||||
qemu_docdir="\${prefix}/share/doc/qemu" | |||||
bindir="\${prefix}/bin" | |||||
@@ -317,6 +317,10 @@ virglrenderer="" | |||||
tpm="yes" | |||||
libssh2="" | |||||
vhdx="" | |||||
+quorum="no" | |||||
+pcap="no" | |||||
+pcap_create="no" | |||||
+bpf="no" | |||||
numa="" | |||||
tcmalloc="no" | |||||
jemalloc="no" | |||||
@@ -576,7 +580,7 @@ FreeBSD) | |||||
audio_drv_list="oss" | |||||
audio_possible_drivers="oss sdl pa" | |||||
# needed for kinfo_getvmmap(3) in libutil.h | |||||
- LIBS="-lutil $LIBS" | |||||
+ LIBS="-lprocstat -lelf -lelf -lelf -lelf -lelf -lelf -lkvm -lelf -lutil $LIBS" | |||||
netmap="" # enable netmap autodetect | |||||
HOST_VARIANT_DIR="freebsd" | |||||
;; | |||||
@@ -879,6 +883,10 @@ for opt do | |||||
;; | |||||
--enable-vnc-png) vnc_png="yes" | |||||
;; | |||||
+ --enable-pcap) pcap="yes" | |||||
+ ;; | |||||
+ --disable-pcap) pcap="no" | |||||
+ ;; | |||||
--disable-slirp) slirp="no" | |||||
;; | |||||
--disable-uuid) uuid="no" | |||||
@@ -2161,7 +2169,7 @@ if test "$gtk" != "no"; then | |||||
gtk_cflags="$gtk_cflags $x11_cflags" | |||||
gtk_libs="$gtk_libs $x11_libs" | |||||
fi | |||||
- libs_softmmu="$gtk_libs $libs_softmmu" | |||||
+ libs_softmmu="$gtk_libs -lintl $libs_softmmu" | |||||
gtk="yes" | |||||
elif test "$gtk" = "yes"; then | |||||
feature_not_found "gtk" "Install gtk2 or gtk3 devel" | |||||
@@ -2389,6 +2397,14 @@ if ! check_include "ifaddrs.h" ; then | |||||
fi | |||||
########################################## | |||||
+# getifaddrs (for tests/test-io-channel-socket ) | |||||
+ | |||||
+have_ifaddrs_h=yes | |||||
+if ! check_include "ifaddrs.h" ; then | |||||
+ have_ifaddrs_h=no | |||||
+fi | |||||
+ | |||||
+########################################## | |||||
# VTE probe | |||||
if test "$vte" != "no"; then | |||||
@@ -2531,6 +2547,50 @@ EOF | |||||
fi | |||||
fi | |||||
+########################################## | |||||
+# pcap probe | |||||
+ | |||||
+if test "$pcap" = "yes" -a "$pcap" != "no"; then | |||||
+ cat > $TMPC << EOF | |||||
+#include <pcap.h> | |||||
+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); } | |||||
+EOF | |||||
+ if test "$mingw32" = "no" ; then | |||||
+ libpcap=-lpcap | |||||
+ else | |||||
+ libpcap=-lwpcap | |||||
+ fi | |||||
+ if compile_prog "" "$libpcap" ; then | |||||
+ : | |||||
+ else | |||||
+ echo | |||||
+ echo "Error: Could not find pcap" | |||||
+ echo "Make sure to have the pcap libs and headers installed." | |||||
+ echo | |||||
+ exit 1 | |||||
+ fi | |||||
+ cat > $TMPC << EOF | |||||
+#include <pcap.h> | |||||
+int main(void) | |||||
+{ | |||||
+ char errbuf[PCAP_ERRBUF_SIZE]; | |||||
+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0); | |||||
+} | |||||
+EOF | |||||
+ if compile_prog "" "$libpcap" ; then | |||||
+ pcap_create="yes" | |||||
+ fi | |||||
+ cat > $TMPC << EOF | |||||
+#define PCAP_DONT_INCLUDE_PCAP_BPF_H | |||||
+#include <pcap.h> | |||||
+#include <net/bpf.h> | |||||
+int main(void) { return (BPF_MAJOR_VERSION); } | |||||
+EOF | |||||
+ if compile_prog ; then | |||||
+ bpf="yes" | |||||
+ fi | |||||
+ libs_softmmu="$libpcap $libs_softmmu" | |||||
+fi # test "$pcap" | |||||
########################################## | |||||
# VNC SASL detection | |||||
@@ -2945,7 +3005,7 @@ for i in $glib_modules; do | |||||
glib_libs=`$pkg_config --libs $i` | |||||
CFLAGS="$glib_cflags $CFLAGS" | |||||
LIBS="$glib_libs $LIBS" | |||||
- libs_qga="$glib_libs $libs_qga" | |||||
+ libs_qga="$glib_libs -lintl -lintl -lintl -lintl -lintl -lintl $libs_qga" | |||||
else | |||||
error_exit "glib-$glib_req_ver $i is required to compile QEMU" | |||||
fi | |||||
@@ -3021,7 +3081,7 @@ if test "$pixman" = ""; then | |||||
fi | |||||
fi | |||||
if test "$pixman" = "none"; then | |||||
- if test "$want_tools" != "no" -o "$softmmu" != "no"; then | |||||
+ if test "$softmmu" != "no"; then | |||||
error_exit "pixman disabled but system emulation or tools build" \ | |||||
"enabled. You can turn off pixman only if you also" \ | |||||
"disable all system emulation targets and the tools" \ | |||||
@@ -3865,14 +3925,7 @@ fi | |||||
# Check if tools are available to build documentation. | |||||
if test "$docs" != "no" ; then | |||||
- if has makeinfo && has pod2man; then | |||||
docs=yes | |||||
- else | |||||
- if test "$docs" = "yes" ; then | |||||
- feature_not_found "docs" "Install texinfo and Perl/perl-podlators" | |||||
- fi | |||||
- docs=no | |||||
- fi | |||||
fi | |||||
# Search for bswap_32 function | |||||
@@ -4000,6 +4053,17 @@ fi | |||||
# check for libusb | |||||
if test "$libusb" != "no" ; then | |||||
+ cat > $TMPC << EOF | |||||
+#include <libusb.h> | |||||
+ | |||||
+int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); } | |||||
+EOF | |||||
+ if compile_prog "-Werror" "-lusb -pthread" ; then | |||||
+ libusb="yes" | |||||
+ libusb_cflags="" | |||||
+ libusb_libs=-lusb | |||||
+ libs_softmmu="$libs_softmmu $libusb_libs" | |||||
+ else | |||||
if $pkg_config --atleast-version=1.0.13 libusb-1.0; then | |||||
libusb="yes" | |||||
libusb_cflags=$($pkg_config --cflags libusb-1.0) | |||||
@@ -4012,6 +4076,7 @@ if test "$libusb" != "no" ; then | |||||
fi | |||||
libusb="no" | |||||
fi | |||||
+ fi | |||||
fi | |||||
# check for usbredirparser for usb network redirection support | |||||
@@ -4584,7 +4649,6 @@ if test "$want_tools" = "yes" ; then | |||||
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" | |||||
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then | |||||
tools="qemu-nbd\$(EXESUF) $tools" | |||||
- tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" | |||||
fi | |||||
fi | |||||
if test "$softmmu" = yes ; then | |||||
@@ -4792,6 +4856,7 @@ echo "Audio drivers $audio_drv_list" | |||||
echo "Block whitelist (rw) $block_drv_rw_whitelist" | |||||
echo "Block whitelist (ro) $block_drv_ro_whitelist" | |||||
echo "VirtFS support $virtfs" | |||||
+echo "pcap support $pcap" | |||||
echo "VNC support $vnc" | |||||
if test "$vnc" = "yes" ; then | |||||
echo "VNC SASL support $vnc_sasl" | |||||
@@ -4973,6 +5038,15 @@ fi | |||||
if test "$profiler" = "yes" ; then | |||||
echo "CONFIG_PROFILER=y" >> $config_host_mak | |||||
fi | |||||
+if test "$pcap" = "yes" ; then | |||||
+ echo "CONFIG_PCAP=y" >> $config_host_mak | |||||
+ if test "$pcap_create" = "yes" ; then | |||||
+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak | |||||
+ fi | |||||
+ if test "$bpf" = "yes" ; then | |||||
+ echo "CONFIG_BPF=y" >> $config_host_mak | |||||
+ fi | |||||
+fi | |||||
if test "$slirp" = "yes" ; then | |||||
echo "CONFIG_SLIRP=y" >> $config_host_mak | |||||
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak | |||||
@@ -5184,6 +5258,9 @@ fi | |||||
if test "$have_fsxattr" = "yes" ; then | |||||
echo "HAVE_FSXATTR=y" >> $config_host_mak | |||||
fi | |||||
+if test "$have_ifaddrs_h" = "yes" ; then | |||||
+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak | |||||
+fi | |||||
if test "$vte" = "yes" ; then | |||||
echo "CONFIG_VTE=y" >> $config_host_mak | |||||
echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak |