On 07/22/10 18:42, Todd T. Fries wrote:
Penned by Christian Weisgerber on 20100722 12:53.06, we have: | Christian Weisgerber<na...@openbsd.org> wrote: | |> What are we going to do with emulators/qemu-old? |> |> It is marked as only for i386 and powerpc. However, it also requires |> gcc3 to build and both of these archs now use gcc4. |>
Updated diff, it runs fine @amd64 too with gcc3 from ports. Isn't any conflict-marker needed ? Qemu-old install the same files than qemu. Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/emulators/qemu-old/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 8 Jun 2010 01:10:54 -0000 1.2 +++ Makefile 22 Jul 2010 17:22:48 -0000 @@ -1,12 +1,13 @@ # $OpenBSD: Makefile,v 1.2 2010/06/08 01:10:54 fgsch Exp $ # no success building on other archs yet -ONLY_FOR_ARCHS= i386 powerpc +ONLY_FOR_ARCHS= amd64 i386 powerpc COMMENT= multi system emulator DISTNAME= qemu-0.9.1 -PKGNAME= ${DISTNAME}p13 +PKGNAME= ${DISTNAME} +REVISION= 14 CATEGORIES= emulators HOMEPAGE= http://www.nongnu.org/qemu/ @@ -20,6 +21,9 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_OPENBSD} + +MODULES= gcc3 +MODGCC3_ARCHES= amd64 i386 powerpc BUILD_DEPENDS= ::textproc/texi2html USE_GMAKE= Yes