From owner-svn-ports-all@freebsd.org Tue Feb 12 21:48:13 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AF2014D374B; Tue, 12 Feb 2019 21:48:13 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EBAAF8485C; Tue, 12 Feb 2019 21:48:12 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D84901DD9E; Tue, 12 Feb 2019 21:48:12 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1CLmCI2002188; Tue, 12 Feb 2019 21:48:12 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1CLmC7U002187; Tue, 12 Feb 2019 21:48:12 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201902122148.x1CLmC7U002187@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Tue, 12 Feb 2019 21:48:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492812 - in head/emulators/qemu: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: in head/emulators/qemu: . files X-SVN-Commit-Revision: 492812 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EBAAF8485C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Feb 2019 21:48:13 -0000 Author: bofh Date: Tue Feb 12 21:48:12 2019 New Revision: 492812 URL: https://svnweb.freebsd.org/changeset/ports/492812 Log: emulators/qemu: Add NETMAP support - Build qemu-guest-agent without unused libs [1] - Fix build with DOCS disabled [2] PR: 232949 [1] 230204 [2] Submitted by: zhecka@gmail.com [1] dewayne@heuristicsystems.com.au [2] Reported by: vmaffione Modified: head/emulators/qemu/Makefile head/emulators/qemu/files/patch-Makefile Modified: head/emulators/qemu/Makefile ============================================================================== --- head/emulators/qemu/Makefile Tue Feb 12 21:40:13 2019 (r492811) +++ head/emulators/qemu/Makefile Tue Feb 12 21:48:12 2019 (r492812) @@ -3,7 +3,7 @@ PORTNAME= qemu PORTVERSION= 2.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -19,16 +19,18 @@ LIB_DEPENDS?= libnettle.so:security/nettle \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -HAS_CONFIGURE= yes -USES?= cpe gmake pkgconfig bison perl5 python:2.7,build tar:xz -USE_PERL5= build -MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 -.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils" +.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") +ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 USE_XORG= pixman USE_GNOME+= cairo glib20 libxml2 -ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 .endif +USES?= cpe gl gmake gnome pkgconfig bison perl5 python:2.7,build tar:xz +USE_PERL5= build + +HAS_CONFIGURE= yes +MAKE_ENV+= BSD_MAKE="${MAKE}" V=1 + OPTIONS_DEFINE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \ VDE CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK DOCS NCURSES @@ -61,7 +63,7 @@ PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_OFF= --disable-vnc-png CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_OFF= --disable-curl -OPENGL_USE= GL=yes +OPENGL_USE= GL=glu OPENGL_CONFIGURE_OFF= --disable-opengl USBREDIR_BUILD_DEPENDS= usbredir>=0.6:net/usbredir USBREDIR_RUN_DEPENDS= usbredir>=0.6:net/usbredir @@ -88,7 +90,7 @@ WITHOUT_CPU_CFLAGS=yes #to avoid problems with registe CFLAGS:= ${CFLAGS:C/-fno-tree-vrp//} CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"/usr/lib\" \ --extra-ldflags=-L\"${LOCALBASE}/lib\" --disable-libssh2 --enable-debug \ - --prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \ + --prefix=${PREFIX} --cc=${CC} --enable-netmap --enable-docs --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ --enable-debug-info --python=${PYTHON_CMD} \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" Modified: head/emulators/qemu/files/patch-Makefile ============================================================================== --- head/emulators/qemu/files/patch-Makefile Tue Feb 12 21:40:13 2019 (r492811) +++ head/emulators/qemu/files/patch-Makefile Tue Feb 12 21:48:12 2019 (r492812) @@ -6,13 +6,13 @@ ifdef BUILD_DOCS +ifdef NOPORTDOCS +DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 -+DOCS+=docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 ++DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7 +else DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 - DOCS+=docs/qemu-block-drivers.7 +endif + DOCS+=docs/qemu-block-drivers.7 ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 endif