From owner-svn-ports-head@freebsd.org Sun Dec 1 15:50:24 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 80BDE1AF509; Sun, 1 Dec 2019 15:50:24 +0000 (UTC) (envelope-from asomers@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 47Qt4J2frxz3wgQ; Sun, 1 Dec 2019 15:50:24 +0000 (UTC) (envelope-from asomers@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 3EAD618F05; Sun, 1 Dec 2019 15:50:24 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB1FoO1u044948; Sun, 1 Dec 2019 15:50:24 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB1FoNAV044943; Sun, 1 Dec 2019 15:50:23 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201912011550.xB1FoNAV044943@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 1 Dec 2019 15:50:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518780 - in head/emulators/qemu-utils: . files X-SVN-Group: ports-head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head/emulators/qemu-utils: . files X-SVN-Commit-Revision: 518780 X-SVN-Commit-Repository: ports 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.29 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: Sun, 01 Dec 2019 15:50:24 -0000 Author: asomers (src committer) Date: Sun Dec 1 15:50:23 2019 New Revision: 518780 URL: https://svnweb.freebsd.org/changeset/ports/518780 Log: emulators/qemu-utils: fix build after r518397 PR: 242279 Reported by: pkg-fallout Modified: head/emulators/qemu-utils/Makefile head/emulators/qemu-utils/files/patch-Makefile head/emulators/qemu-utils/files/patch-configure Modified: head/emulators/qemu-utils/Makefile ============================================================================== --- head/emulators/qemu-utils/Makefile Sun Dec 1 15:47:01 2019 (r518779) +++ head/emulators/qemu-utils/Makefile Sun Dec 1 15:50:23 2019 (r518780) @@ -22,10 +22,9 @@ DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES= ${.CURDIR}/files/patch-configure PKGMESSAGE= -PORTDOCS= qemu-doc.html qemu-doc.txt +PORTDOCS= interop/* specs/* CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ - --disable-libssh2 \ --mandir=${MANPREFIX}/man \ --prefix=${PREFIX} --cc=${CC} --disable-kvm \ --disable-linux-user --disable-linux-aio --disable-xen \ @@ -86,5 +85,6 @@ pre-configure: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-* @${RMDIR} ${STAGEDIR}${DATADIR} + @${RM} -rf ${STAGEDIR}${PREFIX}/share .include "${MASTERDIR}/Makefile" Modified: head/emulators/qemu-utils/files/patch-Makefile ============================================================================== --- head/emulators/qemu-utils/files/patch-Makefile Sun Dec 1 15:47:01 2019 (r518779) +++ head/emulators/qemu-utils/files/patch-Makefile Sun Dec 1 15:50:23 2019 (r518780) @@ -41,6 +41,6 @@ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \ - done - $(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all" - for d in $(TARGET_DIRS); do \ - $(MAKE) $(SUBDIR_MAKEFLAGS) TARGET_DIR=$$d/ -C $$d $@ || exit 1 ; \ - done + + .PHONY: ctags + ctags: Modified: head/emulators/qemu-utils/files/patch-configure ============================================================================== --- head/emulators/qemu-utils/files/patch-configure Sun Dec 1 15:47:01 2019 (r518779) +++ head/emulators/qemu-utils/files/patch-configure Sun Dec 1 15:50:23 2019 (r518780) @@ -4,7 +4,7 @@ ########################################## # pixman support probe --if test "$want_tools" = "no" -a "$softmmu" = "no"; then +-if test "$want_tools" = "no" && test "$softmmu" = "no"; then +if test "$softmmu" = "no"; then pixman_cflags= pixman_libs=