From c8f1380f0bdef28e6f5e8f144fee2038167f71f0 Mon Sep 17 00:00:00 2001 From: jasper Date: Tue, 27 Oct 2009 13:07:49 +0000 Subject: [PATCH] - adapt patch now that we have ENOTSUP defined --- emulators/qemu/Makefile | 4 ++-- emulators/qemu/patches/patch-configure | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 76006a9a041..47ccbcfcdf1 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2009/06/02 22:47:52 todd Exp $ +# $OpenBSD: Makefile,v 1.44 2009/10/27 13:07:49 jasper Exp $ # no success building on other archs yet ONLY_FOR_ARCHS= amd64 i386 powerpc @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc COMMENT= multi system emulator DISTNAME= qemu-0.9.1 -PKGNAME= ${DISTNAME}p10 +PKGNAME= ${DISTNAME}p11 CATEGORIES= emulators HOMEPAGE= http://bellard.org/qemu/ diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure index fe62a898914..b8664a600c3 100644 --- a/emulators/qemu/patches/patch-configure +++ b/emulators/qemu/patches/patch-configure @@ -1,6 +1,6 @@ -$OpenBSD: patch-configure,v 1.11 2008/06/19 05:51:17 todd Exp $ ---- configure.orig Sun Jan 6 13:38:42 2008 -+++ configure Tue Jun 17 19:36:42 2008 +$OpenBSD: patch-configure,v 1.12 2009/10/27 13:07:49 jasper Exp $ +--- configure.orig Sun Jan 6 20:38:42 2008 ++++ configure Tue Oct 27 14:01:40 2009 @@ -21,10 +21,10 @@ prefix="" interp_prefix="/usr/gnemul/qemu-%M" static="no" @@ -117,12 +117,11 @@ $OpenBSD: patch-configure,v 1.11 2008/06/19 05:51:17 todd Exp $ fi if test "$coreaudio" = "yes" ; then echo "CONFIG_COREAUDIO=yes" >> $config_mak -@@ -953,6 +967,13 @@ if test "$cocoa" = "yes" ; then +@@ -953,6 +967,12 @@ if test "$cocoa" = "yes" ; then echo "CONFIG_COCOA=yes" >> $config_mak fi +if [ "$openbsd" = "yes" ] ; then -+ echo "#define ENOTSUP 4096" >> $config_h + echo "#define qemu_siginfo siginfo_t" >> $config_h +else + echo "#define qemu_siginfo struct siginfo" >> $config_h @@ -131,7 +130,7 @@ $OpenBSD: patch-configure,v 1.11 2008/06/19 05:51:17 todd Exp $ # XXX: suppress that if [ "$bsd" = "yes" ] ; then echo "#define O_LARGEFILE 0" >> $config_h -@@ -961,6 +982,19 @@ if [ "$bsd" = "yes" ] ; then +@@ -961,6 +981,19 @@ if [ "$bsd" = "yes" ] ; then fi echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h