diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2018-07-22 02:27:07 +0000 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2018-07-22 02:27:07 +0000 |
| commit | 7630f855d53a9805dade995b3312aa876c8218a5 (patch) | |
| tree | 9148e15efd1ac23097c871c32b2a0051e08dca8f /emulators/qemu/files/patch-Makefile | |
| parent | science/mpqc: Unbreak on CURRENT (diff) | |
emulators/qemu: Update version 2.9.0>=2.12.0
- Pet portlint
Relnotes: https://wiki.qemu.org/ChangeLog/2.12
Notes
Notes:
svn path=/head/; revision=475080
Diffstat (limited to 'emulators/qemu/files/patch-Makefile')
| -rw-r--r-- | emulators/qemu/files/patch-Makefile | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/emulators/qemu/files/patch-Makefile b/emulators/qemu/files/patch-Makefile index 0c64d70244ac..84da60ab0b86 100644 --- a/emulators/qemu/files/patch-Makefile +++ b/emulators/qemu/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2017-04-20 14:57:00 UTC +--- Makefile.orig 2018-04-24 16:30:46 UTC +++ Makefile -@@ -206,9 +206,14 @@ LIBS+=-lz $(LIBS_TOOLS) +@@ -350,10 +350,15 @@ LIBS+=-lz $(LIBS_TOOLS) HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) ifdef BUILD_DOCS @@ -9,13 +9,14 @@ +DOCS+=docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 +else DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8 - DOCS+=docs/qemu-qmp-ref.html docs/qemu-qmp-ref.txt docs/qemu-qmp-ref.7 - DOCS+=docs/qemu-ga-ref.html docs/qemu-ga-ref.txt docs/qemu-ga-ref.7 + 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 + DOCS+=docs/qemu-block-drivers.7 +endif ifdef CONFIG_VIRTFS DOCS+=fsdev/virtfs-proxy-helper.1 endif -@@ -558,11 +563,13 @@ BLOBS= +@@ -797,11 +802,13 @@ BLOBS= endif install-doc: $(DOCS) @@ -23,20 +24,20 @@ $(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" -@@ -575,8 +582,10 @@ ifneq ($(TOOLS),) +@@ -815,8 +822,10 @@ ifneq ($(TOOLS),) endif ifneq (,$(findstring qemu-ga,$(TOOLS))) $(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8" +ifndef NOPORTDOCS - $(INSTALL_DATA) docs/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" - $(INSTALL_DATA) docs/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" +endif - $(INSTALL_DATA) docs/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" + $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7" endif endif |