From owner-svn-ports-head@freebsd.org Thu Sep 3 17:39:42 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B31BD9C9251; Thu, 3 Sep 2015 17:39:42 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A36761F4; Thu, 3 Sep 2015 17:39:42 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t83HdgBh067307; Thu, 3 Sep 2015 17:39:42 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t83HdgX4067303; Thu, 3 Sep 2015 17:39:42 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201509031739.t83HdgX4067303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 3 Sep 2015 17:39:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396024 - in head/emulators/qemu-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2015 17:39:42 -0000 Author: sbruno Date: Thu Sep 3 17:39:41 2015 New Revision: 396024 URL: https://svnweb.freebsd.org/changeset/ports/396024 Log: Build fixes for 2.4.0 - regenerate patch-pcap - Escape --extra-ldflags as it looks like the qemu builder is eating spaces or lines making it frustrating to use. PR: 202402 202536 202864 Modified: head/emulators/qemu-devel/Makefile head/emulators/qemu-devel/files/pcap-patch Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Thu Sep 3 17:14:33 2015 (r396023) +++ head/emulators/qemu-devel/Makefile Thu Sep 3 17:39:41 2015 (r396024) @@ -46,7 +46,7 @@ CONFLICTS_INSTALL= qemu-[0-9]* qemu-sbru .include CONFIGURE_ARGS+= --localstatedir=/var -CONFIGURE_ARGS+= --extra-ldflags=-L${LOCALBASE}/lib +CONFIGURE_ARGS+= --extra-ldflags=-L\"${LOCALBASE}/lib\" CONFIGURE_ARGS+= --disable-smartcard-nss --disable-libssh2 PORTDOCS= docs qemu-doc.html qemu-tech.html qmp-commands.txt Modified: head/emulators/qemu-devel/files/pcap-patch ============================================================================== --- head/emulators/qemu-devel/files/pcap-patch Thu Sep 3 17:14:33 2015 (r396023) +++ head/emulators/qemu-devel/files/pcap-patch Thu Sep 3 17:39:41 2015 (r396024) @@ -1,18 +1,18 @@ ---- configure.orig +--- configure.orig 2015-08-11 19:11:05 UTC +++ configure -@@ -335,6 +335,9 @@ libssh2="" +@@ -338,6 +338,9 @@ libssh2="" vhdx="" - quorum="" numa="" + tcmalloc="no" +pcap="no" +pcap_create="no" +bpf="no" # parse CC options first for opt do -@@ -888,6 +891,10 @@ for opt do +@@ -896,6 +899,10 @@ for opt do ;; - --enable-vnc-ws) vnc_ws="yes" + --enable-vnc-png) vnc_png="yes" ;; + --enable-pcap) pcap="yes" + ;; @@ -21,7 +21,7 @@ --disable-slirp) slirp="no" ;; --disable-uuid) uuid="no" -@@ -2216,6 +2223,51 @@ EOF +@@ -2354,6 +2361,51 @@ EOF fi ########################################## @@ -71,9 +71,9 @@ + +########################################## # VNC TLS/WS detection - if test "$vnc" = "yes" -a \( "$vnc_tls" != "no" -o "$vnc_ws" != "no" \) ; then + if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then cat > $TMPC <> $config_host_mak fi @@ -97,11 +97,12 @@ if test "$slirp" = "yes" ; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak -Index: net/clients.h +--- net/clients.h.orig 2015-08-11 19:11:09 UTC ++++ net/clients.h @@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio int net_init_l2tpv3(const NetClientOptions *opts, const char *name, - NetClientState *peer); + NetClientState *peer, Error **errp); + +#ifdef CONFIG_PCAP +int net_init_pcap(const NetClientOptions *opts, const char *name, @@ -110,11 +111,22 @@ Index: net/clients.h + #ifdef CONFIG_VDE int net_init_vde(const NetClientOptions *opts, const char *name, - NetClientState *peer); -Index: net/net.c -@@ -40,6 +40,11 @@ - #include "qapi/opts-visitor.h" + NetClientState *peer, Error **errp); +--- net/hub.c.orig 2015-08-11 19:11:09 UTC ++++ net/hub.c +@@ -322,6 +322,7 @@ void net_hub_check_clients(void) + case NET_CLIENT_OPTIONS_KIND_SOCKET: + case NET_CLIENT_OPTIONS_KIND_VDE: + case NET_CLIENT_OPTIONS_KIND_VHOST_USER: ++ case NET_CLIENT_OPTIONS_KIND_PCAP: + has_host_dev = 1; + break; + default: +--- net/net.c.orig 2015-08-11 19:11:09 UTC ++++ net/net.c +@@ -45,6 +45,11 @@ #include "qapi/dealloc-visitor.h" + #include "sysemu/sysemu.h" +#include +#ifdef __FreeBSD__ @@ -124,7 +136,7 @@ Index: net/net.c /* Net bridge is currently not supported for W32. */ #if !defined(_WIN32) # define CONFIG_NET_BRIDGE -@@ -704,6 +709,221 @@ static int net_init_nic(const NetClientO +@@ -880,6 +885,221 @@ static int net_init_nic(const NetClientO return idx; } @@ -346,7 +358,7 @@ Index: net/net.c static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])( const NetClientOptions *opts, -@@ -722,6 +944,9 @@ static int (* const net_client_init_fun[ +@@ -901,6 +1121,9 @@ static int (* const net_client_init_fun[ #ifdef CONFIG_NET_BRIDGE [NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge, #endif @@ -354,22 +366,22 @@ Index: net/net.c + [NET_CLIENT_OPTIONS_KIND_PCAP] = net_init_pcap, +#endif [NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport, - }; - ---- qapi-schema.json.orig + #ifdef CONFIG_VHOST_NET_USED + [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user, +--- qapi-schema.json.orig 2015-08-11 19:11:09 UTC +++ qapi-schema.json -@@ -2165,6 +2165,10 @@ +@@ -2423,6 +2423,10 @@ '*br': 'str', '*helper': 'str' } } -+{ 'type': 'NetdevPcapOptions', ++{ 'struct': 'NetdevPcapOptions', + 'data': { + '*ifname': 'str' } } + ## # @NetdevHubPortOptions # -@@ -2232,6 +2236,7 @@ +@@ -2490,6 +2494,7 @@ 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', 'l2tpv3': 'NetdevL2TPv3Options', @@ -377,13 +389,3 @@ Index: net/net.c 'socket': 'NetdevSocketOptions', 'vde': 'NetdevVdeOptions', 'dump': 'NetdevDumpOptions', ---- net/hub.c.orig -+++ net/hub.c -@@ -325,6 +325,7 @@ void net_hub_check_clients(void) - case NET_CLIENT_OPTIONS_KIND_VHOST_USER: -+ case NET_CLIENT_OPTIONS_KIND_PCAP: - has_host_dev = 1; - break; - default: - break; - }