kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

emulators/qemu-utils: Update to 2.9.0

Browse source 
Update emulators/qemu-utils to build at version 2.9.0. Its master port made
the update in r447330.

Reported by:	pkg-fallout
Reviewed by:	sbruno
Approved by:	sbruno (ports)
Sponsored by:	Spectra Logic Corp
Differential Revision:	https://reviews.freebsd.org/D11915
This commit is contained in:
Alan Somers 2017-08-07 18:26:53 +00:00
parent 826ea97d57
commit 27c29c8192
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447503
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
emulators/qemu-utils/Makefile
View file

@ -15,14 +15,15 @@ CONFLICTS_INSTALL= qemu-[0-9]* qemu-devel-* qemu-sbruno-*
OPTIONS_SLAVE= DOCS
OPTIONS_EXCLUDE= SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
STATIC_LINK NCURSES
STATIC_LINK NCURSES VDE
MASTERDIR= ${.CURDIR}/../qemu
PLIST= ${.CURDIR}/pkg-plist
DESCR= ${.CURDIR}/pkg-descr
EXTRA_PATCHES= ${.CURDIR}/files/patch-Makefile ${.CURDIR}/files/patch-configure
EXTRA_PATCHES= ${.CURDIR}/files/patch-configure
PKGMESSAGE=
PORTDOCS= qemu-doc.html qmp-commands.txt
PORTDOCS= qemu-doc.html qemu-doc.txt
CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
--disable-libssh2 \
@ -52,7 +53,6 @@ CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
--disable-bluez \
--disable-kvm \
--disable-rdma \
--disable-uuid \
--disable-vde \
--disable-netmap \
--disable-cap-ng \
@ -71,7 +71,6 @@ CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
--disable-seccomp \
--disable-coroutine-pool \
--disable-glusterfs \
--disable-archipelago \
--disable-tpm \
--disable-numa \
--disable-blobs \
@ -79,6 +78,13 @@ CONFIGURE_ARGS?=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
LIB_DEPENDS=
# qemu-utils must patch Makefile during pre-configure, because the master port
# also patches Makefile. We can't use EXTRA_PATCHES, because that happens
# before do-patch, and causes a conflict with the master port's patch. And we
# can't use post-patch, because the master port also defines that target.
pre-configure:
${PATCH} ${WRKSRC}/Makefile ${.CURDIR}/files/patch-Makefile
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
@${RMDIR} ${STAGEDIR}${DATADIR}

21
emulators/qemu-utils/files/patch-Makefile
View file

@ -1,6 +1,21 @@
--- Makefile.orig 2017-03-31 14:07:03 UTC
+++ Makefile
@@ -484,11 +490,6 @@ endif
--- Makefile.orig 2017-08-07 11:28:12.728245720 -0600
+++ Makefile 2017-08-07 11:28:49.098244913 -0600
@@ -566,14 +566,10 @@
$(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)"
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"
ifneq ($(TOOLS),)
$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
@@ -625,11 +621,6 @@
ifeq ($(CONFIG_GTK),y)
$(MAKE) -C po $@
endif