qemu-git: Try to make the -lrt patch pretty

[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:20:57 2017 +0200
Changeset:	d8da7ea8283f9301099f07568b6c8b421b43ee29

Modified Files:
	qemu-git/distinfo
	qemu-git/patches/patch-Makefile
	qemu-git/patches/patch-configure

Log Message:
qemu-git: Try to make the -lrt patch pretty

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

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  |  2 +-
 qemu-git/patches/patch-configure | 43 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 4 deletions(-)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index 9f1087f966..e58215f683 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-Makefile) = 4bf9a94399c51d4e7bd069449220f6a2ae8b89b8
-SHA1 (patch-configure) = f28aaa0fb30fed33ddae46982a6d06a3039407b2
+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
diff --git a/qemu-git/patches/patch-Makefile b/qemu-git/patches/patch-Makefile
index 671fd2c666..1e8c59cb6e 100644
--- a/qemu-git/patches/patch-Makefile
+++ b/qemu-git/patches/patch-Makefile
@@ -6,7 +6,7 @@ $NetBSD$
  	$(call LINK, $^)
  ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
  	$(call LINK, $^)
-+ivshmem-server$(EXESUF): LIBS += -lrt
++ivshmem-server$(EXESUF): LIBS += $(LIBS_SHMLIB)
  
  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 93a160ee12..c458136caa 100644
--- a/qemu-git/patches/patch-configure
+++ b/qemu-git/patches/patch-configure
@@ -2,7 +2,15 @@ $NetBSD$
 
 --- configure.orig	2017-05-12 22:04:02.000000000 +0000
 +++ configure
-@@ -3034,14 +3034,13 @@ if test "$curses" != "no" ; then
+@@ -179,6 +179,7 @@ audio_pt_int=""
+ audio_win_int=""
+ cc_i386=i386-pc-linux-gnu-gcc
+ libs_qga=""
++libs_shmlib=""
+ debug_info="yes"
+ stack_protector=""
+ 
+@@ -3034,14 +3035,13 @@ if test "$curses" != "no" ; then
  #include <curses.h>
  #include <wchar.h>
  int main(void) {
@@ -18,3 +26,36 @@ $NetBSD$
  }
  EOF
    IFS=:
+@@ -4133,6 +4133,24 @@ elif compile_prog "" "$pthread_lib -lrt"
+   libs_qga="$libs_qga -lrt"
+ fi
+ 
++##########################################
++# Do we need librt for shm_open()
++cat > $TMPC <<EOF
++#include <sys/mman.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <stddef.h>
++int main(void) {
++  return shm_open(NULL, O_RDWR, 0644);
++}
++EOF
++
++if compile_prog "" "" ; then
++  :
++elif compile_prog "" "-lrt" ; then
++  libs_shmlib="$libs_shmlib -lrt"
++fi
++
+ if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
+         "$aix" != "yes" -a "$haiku" != "yes" ; then
+     libs_softmmu="-lutil $libs_softmmu"
+@@ -5949,6 +5967,7 @@ echo "EXESUF=$EXESUF" >> $config_host_ma
+ echo "DSOSUF=$DSOSUF" >> $config_host_mak
+ echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
+ echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
++echo "LIBS_SHMLIB+=$libs_shmlib" >> $config_host_mak
+ echo "TASN1_LIBS=$tasn1_libs" >> $config_host_mak
+ echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak
+ echo "POD2MAN=$POD2MAN" >> $config_host_mak