Attachment #218050 for bug #248101

View | Details | Raw Unified | Return to bug 248101
Collapse All | Expand All

Lines 5-12 Link Here

(-)Makefile (-2 lines)
5	MAINTAINER= ken@FreeBSD.org	5	MAINTAINER= ken@FreeBSD.org
6	COMMENT= QEMU userland utilities	6	COMMENT= QEMU userland utilities
7		7
8	BROKEN= fails to configure
9
10	HAS_CONFIGURE= yes	8	HAS_CONFIGURE= yes
11	USES= compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \	9	USES= compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \
12	python:build tar:xz	10	python:build tar:xz




--- Makefile.orig	2020-09-18 12:03:57 UTC
+++ Makefile
@@ -344,14 +344,11 @@ endif
 ifdef BUILD_DOCS
 ifdef NOPORTDOCS
 DOCS=qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8
-DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7
+DOCS+=docs/interop/qemu-ga-ref.7
 else
 DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8
-DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
 DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
 endif

 ifdef CONFIG_VIRTFS
 DOCS+=fsdev/virtfs-proxy-helper.1
 endif
@@ -828,16 +825,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/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
-	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
-	$(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"
 ifeq ($(CONFIG_TOOLS),y)
 	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
@@ -942,11 +933,6 @@ endif
 ifeq ($(CONFIG_PLUGIN),y)
 	$(INSTALL_DATA) $(SRC_PATH)/include/qemu/qemu-plugin.h "$(DESTDIR)$(includedir)/qemu-plugin.h"
 endif
-	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
-	set -e; for x in $(KEYMAPS); do \

Return to bug 248101

Lines 1-12 Link Here

(-)files/patch-Makefile (-10 / +11 lines)
1	--- Makefile.orig 2019-08-08 19:18:25.578250000 +0000	1	--- Makefile.orig 2020-09-18 12:03:57 UTC
2	+++ Makefile 2019-08-08 19:20:21.482341000 +0000	2	+++ Makefile
3	@@ -355,14 +355,10 @@	3	@@ -344,14 +344,11 @@ endif
4	ifdef BUILD_DOCS	4	ifdef BUILD_DOCS
5	ifdef NOPORTDOCS	5	ifdef NOPORTDOCS
6	DOCS=qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8	6	DOCS=qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8
7	-DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7	7	-DOCS+=docs/interop/qemu-qmp-ref.7 docs/interop/qemu-ga-ref.7
		8	+DOCS+=docs/interop/qemu-ga-ref.7
8	else	9	else
9	DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8	10	DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8
10	-DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7	11	-DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7
11	DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7	12	DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7
12	endif	13	endif
Lines 15-21 Link Here
15	ifdef CONFIG_VIRTFS	16	ifdef CONFIG_VIRTFS
16	DOCS+=fsdev/virtfs-proxy-helper.1	17	DOCS+=fsdev/virtfs-proxy-helper.1
17	endif	18	endif
18	@@ -832,16 +828,10 @@	19	@@ -828,16 +825,10 @@ ifndef NOPORTDOCS
19	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"	20	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
20	$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"	21	$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"
21	$(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)"	22	$(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)"
Lines 29-40 Link Here
29	- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"	30	- $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
30	- $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"	31	- $(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
31	- $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"	32	- $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"
32	ifneq ($(TOOLS),)	33	ifeq ($(CONFIG_TOOLS),y)
33	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"	34	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
34	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"	35	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
35	@@ -895,11 +885,6 @@	36	@@ -942,11 +933,6 @@ endif
36	ifdef CONFIG_GTK	37	ifeq ($(CONFIG_PLUGIN),y)
37	$(MAKE) -C po $@	38	$(INSTALL_DATA) $(SRC_PATH)/include/qemu/qemu-plugin.h "$(DESTDIR)$(includedir)/qemu-plugin.h"
38	endif	39	endif
39	- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"	40	- $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
40	- set -e; for x in $(KEYMAPS); do \	41	- set -e; for x in $(KEYMAPS); do \