Page MenuHomeFreeBSD
Files F159148956

D11915.id31712.diff
No OneTemporary
Actions

D11915.id31712.diff
View Options

Index: emulators/qemu-utils/Makefile
===================================================================
--- emulators/qemu-utils/Makefile
+++ emulators/qemu-utils/Makefile
@@ -15,14 +15,15 @@
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 @@
--disable-bluez \
--disable-kvm \
--disable-rdma \
- --disable-uuid \
--disable-vde \
--disable-netmap \
--disable-cap-ng \
@@ -71,13 +71,19 @@
--disable-seccomp \
--disable-coroutine-pool \
--disable-glusterfs \
- --disable-archipelago \
--disable-tpm \
--disable-numa \
--disable-blobs \
--without-pixman
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-*
Index: emulators/qemu-utils/files/patch-Makefile
===================================================================
--- emulators/qemu-utils/files/patch-Makefile
+++ emulators/qemu-utils/files/patch-Makefile
@@ -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

File Metadata

Mime Type
text/plain
Expires
Thu, Jun 11, 3:57 PM (17 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33883739
Default Alt Text
D11915.id31712.diff (2 KB)

Event Timeline