Date: Thu, 26 Jul 2018 01:36:49 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475342 - in head/emulators/qemu-utils: . files Message-ID: <201807260136.w6Q1anUU056763@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers (src committer) Date: Thu Jul 26 01:36:48 2018 New Revision: 475342 URL: https://svnweb.freebsd.org/changeset/ports/475342 Log: emulators/qemu-utils: fix build after r475080 r475080 updated the master port, emulators/qemu, to version 2.12.0 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 Thu Jul 26 01:03:40 2018 (r475341) +++ head/emulators/qemu-utils/Makefile Thu Jul 26 01:36:48 2018 (r475342) @@ -23,7 +23,6 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-configure PKGMESSAGE= PORTDOCS= qemu-doc.html qemu-doc.txt - CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --disable-libssh2 \ @@ -73,8 +72,7 @@ CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=- --disable-glusterfs \ --disable-tpm \ --disable-numa \ - --disable-blobs \ - --without-pixman + --disable-blobs LIB_DEPENDS= Modified: head/emulators/qemu-utils/files/patch-Makefile ============================================================================== --- head/emulators/qemu-utils/files/patch-Makefile Thu Jul 26 01:03:40 2018 (r475341) +++ head/emulators/qemu-utils/files/patch-Makefile Thu Jul 26 01:36:48 2018 (r475342) @@ -1,22 +1,23 @@ ---- Makefile.orig 2017-08-07 11:28:12.728245720 -0600 -+++ Makefile 2017-08-07 11:28:49.098244913 -0600 -@@ -566,14 +566,10 @@ +--- Makefile.orig 2018-07-26 01:18:43 UTC ++++ Makefile +@@ -806,15 +806,10 @@ ifndef NOPORTDOCS $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)" -- $(INSTALL_DATA) docs/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" -- $(INSTALL_DATA) docs/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" +- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" +- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" endif ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" -- $(INSTALL_DATA) docs/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" +- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" +- $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7" ifneq ($(TOOLS),) $(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" -@@ -625,11 +621,6 @@ - ifeq ($(CONFIG_GTK),y) +@@ -868,11 +863,6 @@ endif + ifdef CONFIG_GTK $(MAKE) -C po $@ endif - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" Modified: head/emulators/qemu-utils/files/patch-configure ============================================================================== --- head/emulators/qemu-utils/files/patch-configure Thu Jul 26 01:03:40 2018 (r475341) +++ head/emulators/qemu-utils/files/patch-configure Thu Jul 26 01:36:48 2018 (r475342) @@ -1,18 +1,20 @@ ---- configure.orig 2016-08-17 15:26:51 UTC +--- configure.orig 2018-04-24 16:30:46 UTC +++ configure -@@ -3021,7 +3021,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" \ -@@ -4584,7 +4584,6 @@ if test "$want_tools" = "yes" ; then +@@ -3452,7 +3452,7 @@ fi + ########################################## + # pixman support probe + +-if test "$want_tools" = "no" -a "$softmmu" = "no"; then ++if test "$softmmu" = "no"; then + pixman_cflags= + pixman_libs= + elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then +@@ -5498,9 +5498,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" +- fi +- if [ "$ivshmem" = "yes" ]; then - tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools" fi fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807260136.w6Q1anUU056763>