qemu-git: Improve patch for -lrt for upstream

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat May 13 02:05:11 2017 +0200
Changeset:	03eb7c64ebe9686b3e334061eaa2c1dac997ba3f

Modified Files:
	qemu-git/distinfo
	qemu-git/patches/patch-configure
Added Files:
	qemu-git/patches/patch-Makefile
Removed Files:
	qemu-git/patches/patch-contrib_ivshmem-server_ivshmem-server.c

Log Message:
qemu-git: Improve patch for -lrt for upstream

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

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

diffstat:
 qemu-git/distinfo                                  |  4 ++--
 qemu-git/patches/patch-Makefile                    | 12 +++++++++++
 qemu-git/patches/patch-configure                   | 25 ----------------------
 .../patch-contrib_ivshmem-server_ivshmem-server.c  | 15 -------------
 4 files changed, 14 insertions(+), 42 deletions(-)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index 52eb22a836..9f1087f966 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,7 +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) = cd6c056f6292f3c7e7ffe4f9297149c7145f3f22
-SHA1 (patch-contrib_ivshmem-server_ivshmem-server.c) = 8dacd981dab4b672cda00f21ca707c47c44020f2
+SHA1 (patch-Makefile) = 4bf9a94399c51d4e7bd069449220f6a2ae8b89b8
+SHA1 (patch-configure) = f28aaa0fb30fed33ddae46982a6d06a3039407b2
 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-Makefile b/qemu-git/patches/patch-Makefile
new file mode 100644
index 0000000000..671fd2c666
--- /dev/null
+++ b/qemu-git/patches/patch-Makefile
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- Makefile.orig	2017-04-25 12:42:53.000000000 +0000
++++ Makefile
+@@ -473,6 +473,7 @@ ivshmem-client$(EXESUF): $(ivshmem-clien
+ 	$(call LINK, $^)
+ ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
+ 	$(call LINK, $^)
++ivshmem-server$(EXESUF): LIBS += -lrt
+ 
+ module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
+ 	$(call quiet-command,$(PYTHON) $< $@ \
diff --git a/qemu-git/patches/patch-configure b/qemu-git/patches/patch-configure
index 3c793c8ac8..93a160ee12 100644
--- a/qemu-git/patches/patch-configure
+++ b/qemu-git/patches/patch-configure
@@ -18,28 +18,3 @@ $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
deleted file mode 100644
index 8d4252743f..0000000000
--- a/qemu-git/patches/patch-contrib_ivshmem-server_ivshmem-server.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$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 */