Date: Sun, 1 Dec 2019 15:50:23 +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: r518780 - in head/emulators/qemu-utils: . files Message-ID: <201912011550.xB1FoNAV044943@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912011550.xB1FoNAV044943>