qemu-git: Add draft patches to make it build

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qemu-git: Add draft patches to make it build
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Fri, 12 May 2017 23:39:52 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat May 13 01:39:52 2017 +0200
Changeset:	9ff7d17cbc71c5bbec0fa043bbb5743abade6fc4

Modified Files:
	qemu-git/Makefile
	qemu-git/PLIST
	qemu-git/distinfo
	qemu-git/patches/patch-configure
Added Files:
	qemu-git/patches/patch-contrib_ivshmem-server_ivshmem-server.c
	qemu-git/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc
	qemu-git/patches/patch-disas_libvixl_vixl_utils.h

Log Message:
qemu-git: Add draft patches to make it build

This delta is scratch in preparation for cleanup.

PLIST has been overwritten.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9ff7d17cbc71c5bbec0fa043bbb5743abade6fc4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-git/Makefile                                  |  2 +-
 qemu-git/PLIST                                     | 53 ++++++++--------------
 qemu-git/distinfo                                  |  5 +-
 qemu-git/patches/patch-configure                   | 29 +++++++++++-
 .../patch-contrib_ivshmem-server_ivshmem-server.c  | 15 ++++++
 .../patch-disas_libvixl_vixl_a64_disasm-a64.cc     | 14 ++++++
 qemu-git/patches/patch-disas_libvixl_vixl_utils.h  | 19 ++++++++
 7 files changed, 98 insertions(+), 39 deletions(-)

diffs:
diff --git a/qemu-git/Makefile b/qemu-git/Makefile
index a0ec1a70f1..6222b9ee5d 100644
--- a/qemu-git/Makefile
+++ b/qemu-git/Makefile
@@ -68,7 +68,7 @@ NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-mips64
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-mips64el
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-mipsel
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-moxie
-NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-or32
+#NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-or32
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-ppc
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-ppc64
 NOT_PAX_MPROTECT_SAFE+=	bin/qemu-system-ppcemb
diff --git a/qemu-git/PLIST b/qemu-git/PLIST
index 332989f6f1..2d8eb6028a 100644
--- a/qemu-git/PLIST
+++ b/qemu-git/PLIST
@@ -1,31 +1,13 @@
-@comment $NetBSD: PLIST,v 1.49 2017/02/27 05:19:29 adam Exp $
-${PLIST.ivshmem}bin/ivshmem-client
-${PLIST.ivshmem}bin/ivshmem-server
-${PLIST.alpha}bin/qemu-alpha
-${PLIST.arm}bin/qemu-arm
-${PLIST.armeb}bin/qemu-armeb
-${PLIST.cris}bin/qemu-cris
+@comment $NetBSD$
+bin/ivshmem-client
+bin/ivshmem-server
 bin/qemu-ga
-${PLIST.i386}bin/qemu-i386
+bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
-${PLIST.m68k}bin/qemu-m68k
-${PLIST.microblaze}bin/qemu-microblaze
-${PLIST.microblazeel}bin/qemu-microblazeel
-${PLIST.mips}bin/qemu-mips
-${PLIST.mipsel}bin/qemu-mipsel
-${PLIST.nbd}bin/qemu-nbd
-${PLIST.or32}bin/qemu-or32
-${PLIST.ppc}bin/qemu-ppc
-${PLIST.ppc64}bin/qemu-ppc64
-${PLIST.ppc64abi32}bin/qemu-ppc64abi32
-${PLIST.s390x}bin/qemu-s390x
-${PLIST.sh4}bin/qemu-sh4
-${PLIST.sh4eb}bin/qemu-sh4eb
-${PLIST.sparc}bin/qemu-sparc
-${PLIST.sparc32plus}bin/qemu-sparc32plus
-${PLIST.sparc64}bin/qemu-sparc64
-${PLIST.unicore32}bin/qemu-unicore32
+bin/qemu-nbd
+bin/qemu-sparc
+bin/qemu-sparc64
 bin/qemu-system-aarch64
 bin/qemu-system-alpha
 bin/qemu-system-arm
@@ -40,7 +22,8 @@ bin/qemu-system-mips64
 bin/qemu-system-mips64el
 bin/qemu-system-mipsel
 bin/qemu-system-moxie
-bin/qemu-system-or32
+bin/qemu-system-nios2
+bin/qemu-system-or1k
 bin/qemu-system-ppc
 bin/qemu-system-ppc64
 bin/qemu-system-ppcemb
@@ -54,21 +37,20 @@ bin/qemu-system-unicore32
 bin/qemu-system-x86_64
 bin/qemu-system-xtensa
 bin/qemu-system-xtensaeb
-${PLIST.x86_64}bin/qemu-x86_64
+bin/qemu-x86_64
 man/man1/qemu-img.1
 man/man1/qemu.1
+man/man7/qemu-ga-ref.7
+man/man7/qemu-qmp-ref.7
 man/man8/qemu-ga.8
 man/man8/qemu-nbd.8
 share/doc/qemu/Makefile.multinode-NetBSD
 share/doc/qemu/qemu-doc.html
-share/doc/qemu/qmp-commands.txt
-${PLIST.gtk}share/locale/bg/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/de_DE/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/fr_FR/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/hu/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/it/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/tr/LC_MESSAGES/qemu.mo
-${PLIST.gtk}share/locale/zh_CN/LC_MESSAGES/qemu.mo
+share/doc/qemu/qemu-doc.txt
+share/doc/qemu/qemu-ga-ref.html
+share/doc/qemu/qemu-ga-ref.txt
+share/doc/qemu/qemu-qmp-ref.html
+share/doc/qemu/qemu-qmp-ref.txt
 share/qemu/QEMU,cgthree.bin
 share/qemu/QEMU,tcx.bin
 share/qemu/acpi-dsdt.aml
@@ -152,3 +134,4 @@ share/qemu/vgabios-stdvga.bin
 share/qemu/vgabios-virtio.bin
 share/qemu/vgabios-vmware.bin
 share/qemu/vgabios.bin
+@pkgdir var/run
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index 04dbad1446..52eb22a836 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,4 +4,7 @@ SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7
 RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a
 SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
-SHA1 (patch-configure) = cf38092c108e540aa686ce48a69020fddc83351d
+SHA1 (patch-configure) = cd6c056f6292f3c7e7ffe4f9297149c7145f3f22
+SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = 8dacd981dab4b672cda00f21ca707c47c44020f2
+SHA1 (patch-disas_libvixl_vixl_a64_disasm-a64.cc) = e39ff18a027182ecd47045c400c28f3b4d61d44b
+SHA1 (patch-disas_libvixl_vixl_utils.h) = 8d53650856fc1f91b811e158e5df8adae68b1f72
diff --git a/qemu-git/patches/patch-configure b/qemu-git/patches/patch-configure
index 03e7281720..3c793c8ac8 100644
--- a/qemu-git/patches/patch-configure
+++ b/qemu-git/patches/patch-configure
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- configure.orig	2017-04-25 12:42:53.000000000 +0000
+--- configure.orig	2017-05-12 22:04:02.000000000 +0000
 +++ configure
-@@ -2998,14 +2998,13 @@ if test "$curses" != "no" ; then
+@@ -3034,14 +3034,13 @@ if test "$curses" != "no" ; then
  #include <curses.h>
  #include <wchar.h>
  int main(void) {
@@ -18,3 +18,28 @@ $NetBSD$
  }
  EOF
    IFS=:
+@@ -3840,6 +3839,8 @@ if compile_prog "" "" ; then
+   fallocate_zero_range=yes
+ fi
+ 
++
++
+ # check for posix_fallocate
+ posix_fallocate=no
+ cat > $TMPC << EOF
+@@ -4116,10 +4117,15 @@ fi
+ # support and one without. This means that the clock_gettime() don't
+ # need -lrt. We still need it for timer_create() so we check for this
+ # function in addition.
++# NetBSD requires -lrt for shm_open() so check for it too.
+ cat > $TMPC <<EOF
++#include <sys/types.h>
++#include <sys/mman.h>
++#include <fcntl.h>
+ #include <signal.h>
+ #include <time.h>
+ int main(void) {
++  shm_open(NULL, O_RDWR, 0644);
+   timer_create(CLOCK_REALTIME, NULL, NULL);
+   return clock_gettime(CLOCK_REALTIME, NULL);
+ }
diff --git a/qemu-git/patches/patch-contrib_ivshmem-server_ivshmem-server.c b/qemu-git/patches/patch-contrib_ivshmem-server_ivshmem-server.c
new file mode 100644
index 0000000000..8d4252743f
--- /dev/null
+++ b/qemu-git/patches/patch-contrib_ivshmem-server_ivshmem-server.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- contrib/ivshmem-server/ivshmem-server.c.orig	2017-04-25 12:42:53.000000000 +0000
++++ contrib/ivshmem-server/ivshmem-server.c
+@@ -13,6 +13,10 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ 
++    #include <sys/types.h>
++     #include <sys/mman.h>
++     #include <fcntl.h>
++
+ #include "ivshmem-server.h"
+ 
+ /* log a message on stdout if verbose=1 */
diff --git a/qemu-git/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc b/qemu-git/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc
new file mode 100644
index 0000000000..11a2188297
--- /dev/null
+++ b/qemu-git/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- disas/libvixl/vixl/a64/disasm-a64.cc.orig	2017-04-25 12:42:53.000000000 +0000
++++ disas/libvixl/vixl/a64/disasm-a64.cc
+@@ -24,8 +24,8 @@
+ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-#include <cstdlib>
+ #include "vixl/a64/disasm-a64.h"
++#include <cstdlib>
+ 
+ namespace vixl {
+ 
diff --git a/qemu-git/patches/patch-disas_libvixl_vixl_utils.h b/qemu-git/patches/patch-disas_libvixl_vixl_utils.h
new file mode 100644
index 0000000000..d5986edeca
--- /dev/null
+++ b/qemu-git/patches/patch-disas_libvixl_vixl_utils.h
@@ -0,0 +1,19 @@
+$NetBSD$
+
+--- disas/libvixl/vixl/utils.h.orig	2017-04-25 12:42:53.000000000 +0000
++++ disas/libvixl/vixl/utils.h
+@@ -27,11 +27,12 @@
+ #ifndef VIXL_UTILS_H
+ #define VIXL_UTILS_H
+ 
+-#include <string.h>
+-#include <cmath>
+ #include "vixl/globals.h"
+ #include "vixl/compiler-intrinsics.h"
+ 
++#include <string.h>
++#include <cmath>
++
+ namespace vixl {
+ 
+ // Macros for compile-time format checking.
Prev by Date: qemu-git: Eliminate merged patch upstream
Next by Date: qemu-git: Improve patch for -lrt for upstream
Previous by Thread: qemu-git: Eliminate merged patch upstream
Next by Thread: qemu-git: Improve patch for -lrt for upstream
Indexes:
Home | Main Index | Thread Index | Old Index