qemu-git: Rework patch for upstram fixing libvixl/netbsd build

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun May 14 07:01:31 2017 +0200
Changeset:	ddb470f3e2d56b1b64aee7963d259cc70c83c0dc

Modified Files:
	qemu-git/distinfo
Added Files:
	qemu-git/patches/patch-disas_libvixl_Makefile.objs
Removed Files:
	qemu-git/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc
	qemu-git/patches/patch-disas_libvixl_vixl_utils.h

Log Message:
qemu-git: Rework patch for upstram fixing libvixl/netbsd build

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

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

diffstat:
 qemu-git/distinfo                                     |  3 +--
 qemu-git/patches/patch-disas_libvixl_Makefile.objs    | 13 +++++++++++++
 .../patch-disas_libvixl_vixl_a64_disasm-a64.cc        | 14 --------------
 qemu-git/patches/patch-disas_libvixl_vixl_utils.h     | 19 -------------------
 4 files changed, 14 insertions(+), 35 deletions(-)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index e58215f683..d1bc66beb9 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -6,5 +6,4 @@ SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88
 Size (qemu-2.8.1.tar.bz2) = 28366270 bytes
 SHA1 (patch-Makefile) = 0ba16abccc18a2fd32f3be434462572fe3e8d25c
 SHA1 (patch-configure) = af6f90677c78458808b64b02b30ce5b87da7ca97
-SHA1 (patch-disas_libvixl_vixl_a64_disasm-a64.cc) = e39ff18a027182ecd47045c400c28f3b4d61d44b
-SHA1 (patch-disas_libvixl_vixl_utils.h) = 8d53650856fc1f91b811e158e5df8adae68b1f72
+SHA1 (patch-disas_libvixl_Makefile.objs) = 5bc8da5c29c95d18d415fad5936e7c2bf9d48b57
diff --git a/qemu-git/patches/patch-disas_libvixl_Makefile.objs b/qemu-git/patches/patch-disas_libvixl_Makefile.objs
new file mode 100644
index 0000000000..eee0d8dce3
--- /dev/null
+++ b/qemu-git/patches/patch-disas_libvixl_Makefile.objs
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- disas/libvixl/Makefile.objs.orig	2017-04-25 12:42:53.000000000 +0000
++++ disas/libvixl/Makefile.objs
+@@ -7,5 +7,8 @@ libvixl_OBJS = vixl/utils.o \
+ # The -Wno-sign-compare is needed only for gcc 4.6, which complains about
+ # some signed-unsigned equality comparisons which later gcc versions do not.
+ $(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) -Wno-sign-compare
++# Ensure that C99 macros are defined regardless of the inclusion order of
++# headers in vixl. This is required at least on NetBSD.
++$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
+ 
+ common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)
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
deleted file mode 100644
index 11a2188297..0000000000
--- a/qemu-git/patches/patch-disas_libvixl_vixl_a64_disasm-a64.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
deleted file mode 100644
index d5986edeca..0000000000
--- a/qemu-git/patches/patch-disas_libvixl_vixl_utils.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$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.