summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorwiedi <wiedi@pkgsrc.org>2015-01-07 21:39:24 +0000
committerwiedi <wiedi@pkgsrc.org>2015-01-07 21:39:24 +0000
commit15a77fe10e2f0e9b21b3495e16a2f651d1fe6751 (patch)
tree4eb31a254d8dc112566ccd21c02bee0a8423f041 /emulators
parentc6c0fd8d433953ba0761a35900bbc96011d48462 (diff)
downloadpkgsrc-15a77fe10e2f0e9b21b3495e16a2f651d1fe6751.tar.gz
fix build on SunOS
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu/distinfo4
-rw-r--r--emulators/qemu/patches/patch-configure13
-rw-r--r--emulators/qemu/patches/patch-tests_Makefile16
3 files changed, 32 insertions, 1 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 0783ad1a218..f76080f25b8 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.99 2014/12/11 14:04:59 ryoon Exp $
+$NetBSD: distinfo,v 1.100 2015/01/07 21:39:24 wiedi Exp $
SHA1 (qemu-2.2.0.tar.bz2) = 9a16623775a92fd25334f4eced4e6a56ab536233
RMD160 (qemu-2.2.0.tar.bz2) = 9a156bdefd8fad72154eee1b10ed53a0e4c1c9a2
Size (qemu-2.2.0.tar.bz2) = 24316697 bytes
+SHA1 (patch-configure) = 2d0d2549056c9f53a932b236ed4d69a5ee58a856
SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a
SHA1 (patch-et) = 036e1a254ce40df635dfb6107d2707879467e127
SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
@@ -12,4 +13,5 @@ SHA1 (patch-hw_ppc_mac__newworld.c) = 9a0ec3ba0b6da2879fdaba6a7937fb16a02685f5
SHA1 (patch-hw_ppc_mac__oldworld.c) = 46322c77c87be6d517c43466325c344db99cd463
SHA1 (patch-memory.c) = 14df9c835ca318fc79a8d3a46bb94d2f229277cc
SHA1 (patch-slirp_tcp__subr.c) = cfc8289384fa987289e32b64532c13a83a890820
+SHA1 (patch-tests_Makefile) = 81fe639ce1b04302f53024343fdf1f6fd5d5fedb
SHA1 (patch-user-exec.c) = eb83832c7c9e5f69313f8cad2c2f77b304072556
diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure
new file mode 100644
index 00000000000..f9245dffc5b
--- /dev/null
+++ b/emulators/qemu/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure,v 1.6 2015/01/07 21:39:24 wiedi Exp $
+Don't use gld on SunOS
+
+--- configure.orig 2014-12-09 14:45:40.000000000 +0000
++++ configure
+@@ -622,7 +622,6 @@ SunOS)
+ solaris="yes"
+ make="${MAKE-gmake}"
+ install="${INSTALL-ginstall}"
+- ld="gld"
+ smbd="${SMBD-/usr/sfw/sbin/smbd}"
+ needs_libsunmath="no"
+ solarisrev=`uname -r | cut -f2 -d.`
diff --git a/emulators/qemu/patches/patch-tests_Makefile b/emulators/qemu/patches/patch-tests_Makefile
new file mode 100644
index 00000000000..42be1c1c531
--- /dev/null
+++ b/emulators/qemu/patches/patch-tests_Makefile
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_Makefile,v 1.1 2015/01/07 21:39:24 wiedi Exp $
+Don't link -lutil on SunOS
+
+--- tests/Makefile.orig 2014-12-09 14:45:44.000000000 +0000
++++ tests/Makefile
+@@ -353,8 +353,10 @@ tests/qemu-iotests/socket_scm_helper$(EX
+ tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o libqemuutil.a libqemustub.a
+
+ ifeq ($(CONFIG_POSIX),y)
++ifneq ($(CONFIG_SOLARIS),y)
+ LIBS += -lutil
+ endif
++endif
+
+ # QTest rules
+