diff options
| -rw-r--r-- | emulators/qemu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-configure | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 8f68f3d9eae..9b99574b85b 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.111 2015/12/22 23:52:00 ryoon Exp $ +$NetBSD: distinfo,v 1.112 2016/03/06 09:55:58 dbj Exp $ SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7 RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9 SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 Size (qemu-2.5.0.tar.bz2) = 25464996 bytes SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92 -SHA1 (patch-configure) = fac9d221ced61d15c037bcf9ec0f13a0eb8229a2 +SHA1 (patch-configure) = fb89393c1f45b24cb7a85d53a516050b2249e8c9 SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18 SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50 diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure index 58a03e7331f..cef319b3d8f 100644 --- a/emulators/qemu/patches/patch-configure +++ b/emulators/qemu/patches/patch-configure @@ -1,5 +1,7 @@ -$NetBSD: patch-configure,v 1.9 2015/12/22 23:52:00 ryoon Exp $ +$NetBSD: patch-configure,v 1.10 2016/03/06 09:55:58 dbj Exp $ + Don't use gld on SunOS +add check for shm_open --- configure.orig 2015-12-16 22:04:48.000000000 +0000 +++ configure @@ -11,7 +13,7 @@ Don't use gld on SunOS smbd="${SMBD-/usr/sfw/sbin/smbd}" needs_libsunmath="no" solarisrev=`uname -r | cut -f2 -d.` -@@ -3672,6 +3671,23 @@ if compile_prog "" "" ; then +@@ -3672,6 +3671,28 @@ if compile_prog "" "" ; then fallocate_zero_range=yes fi @@ -21,6 +23,7 @@ Don't use gld on SunOS +#include <sys/types.h> +#include <sys/mman.h> +#include <fcntl.h> ++#include <stddef.h> // for NULL + +int main(void) +{ @@ -28,14 +31,18 @@ Don't use gld on SunOS + return 0; +} +EOF ++if compile_prog "" "" ; then ++ shm_open=yes ++fi +if compile_prog "" "-lrt" ; then ++ LIBS="$LIBS -lrt" + shm_open=yes +fi + # check for posix_fallocate posix_fallocate=no cat > $TMPC << EOF -@@ -3935,8 +3951,13 @@ fi +@@ -3935,8 +3956,13 @@ fi cat > $TMPC <<EOF #include <signal.h> #include <time.h> @@ -49,7 +56,7 @@ Don't use gld on SunOS return clock_gettime(CLOCK_REALTIME, NULL); } EOF -@@ -4568,7 +4589,9 @@ if test "$want_tools" = "yes" ; then +@@ -4568,7 +4594,9 @@ if test "$want_tools" = "yes" ; then tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools" if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then tools="qemu-nbd\$(EXESUF) $tools" @@ -60,7 +67,7 @@ Don't use gld on SunOS fi fi if test "$softmmu" = yes ; then -@@ -5049,6 +5072,9 @@ fi +@@ -5049,6 +5077,9 @@ fi if test "$fallocate_zero_range" = "yes" ; then echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak fi |