summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorkhorben <khorben>2016-03-24 15:21:10 +0000
committerkhorben <khorben>2016-03-24 15:21:10 +0000
commit10ec2f77900d693e09bf5835bde8dbfba738f86e (patch)
tree96d762c098b3fa18a9c6962a011e43793f8897aa /emulators
parent06640b1c001a233db401cf51a2f8b081980b039a (diff)
downloadpkgsrc-10ec2f77900d693e09bf5835bde8dbfba738f86e.tar.gz
Avoid a "bad substitution" error in the configure script
This fixes building emulators/qemu on netbsd-7 (amd64). On a related note, it may also make sense to include security/nettle/buildlink3.mk to the build.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu/distinfo4
-rw-r--r--emulators/qemu/patches/patch-configure12
2 files changed, 13 insertions, 3 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 545846e4307..1930f7605fb 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.113 2016/03/06 19:41:24 dbj Exp $
+$NetBSD: distinfo,v 1.114 2016/03/24 15:21:10 khorben 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) = c15a44d127d7bdd82285d0b81b710cef7ad81e83
+SHA1 (patch-configure) = 668aff0a22a5800993645a4b40899e7694803ee6
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 ea02a62e7f7..e711bddb01f 100644
--- a/emulators/qemu/patches/patch-configure
+++ b/emulators/qemu/patches/patch-configure
@@ -1,7 +1,8 @@
-$NetBSD: patch-configure,v 1.11 2016/03/06 19:41:24 dbj Exp $
+$NetBSD: patch-configure,v 1.12 2016/03/24 15:21:10 khorben Exp $
Don't use gld on SunOS
add check for shm_open
+avoid bad substitution
--- configure.orig 2015-12-16 22:04:48.000000000 +0000
+++ configure
@@ -66,6 +67,15 @@ add check for shm_open
fi
fi
if test "$softmmu" = yes ; then
+@@ -4758,7 +4785,7 @@ echo "GTK GL support $gtk_gl"
+ echo "GNUTLS support $gnutls"
+ echo "GNUTLS hash $gnutls_hash"
+ echo "libgcrypt $gcrypt"
+-echo "nettle $nettle ${nettle+($nettle_version)}"
++echo "nettle $nettle ($nettle_version)"
+ echo "libtasn1 $tasn1"
+ echo "VTE support $vte"
+ echo "curses support $curses"
@@ -5049,6 +5076,9 @@ fi
if test "$fallocate_zero_range" = "yes" ; then
echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak