Date: Sun, 9 Mar 2008 03:44:02 GMT From: "M. B. Buchanan" <matt.buchanan@yahoo.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/121507: qemu patches are obsolete Message-ID: <200803090344.m293i2TT007369@www.freebsd.org> Resent-Message-ID: <200803090350.m293o1cS012469@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121507 >Category: ports >Synopsis: qemu patches are obsolete >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 09 03:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: M. B. Buchanan >Release: 7.0-RELEASE >Organization: >Environment: FreeBSD gus.mbb.org 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: Patches supplied with the emulators/qemu port are out of sync with the qemu-0.9.1 source tarball. Some files referenced in the patches are missing in the 0.9.1 version, and some of the patches have already been applied. >How-To-Repeat: cd /usr/ports/emulators/qemu; make >Fix: rm /usr/ports/emulators/qemu/files/patch-block-qcow2.c rm /usr/ports/emulators/qemu/files/patch-block-raw.c rm /usr/ports/emulators/qemu/files/patch-audio::ossaudio.c Apply this diff to files/patch-PRId64: --- patch-PRId64.orig 2008-03-08 20:06:42.000000000 -0600 +++ files/patch-PRId64 2008-03-08 20:07:03.000000000 -0600 @@ -1,17 +1,3 @@ -Index: qemu/vl.h -@@ -30,6 +30,12 @@ - #include <stdarg.h> - #include <string.h> - #include <inttypes.h> -+#ifndef PRId64 -+#define PRId64 "lld" /* int64_t */ -+#define PRIo64 "llo" /* int64_t */ -+#define PRIx64 "llx" /* int64_t */ -+#define PRIu64 "llu" /* int64_t */ -+#endif - #include <limits.h> - #include <time.h> - #include <ctype.h> Index: qemu/dis-asm.h @@ -13,6 +13,12 @@ #include <stdio.h> Apply this patch to files/patch-bh: --- patch-bh 2008-03-08 20:41:49.000000000 -0600 +++ files/patch-bh 2008-03-08 20:58:17.000000000 -0600 @@ -1,26 +1,21 @@ -Index: qemu/dyngen-exec.h -=================================================================== -RCS file: /cvsroot/qemu/qemu/dyngen-exec.h,v -retrieving revision 1.12 -diff -w -u -d -r1.12 dyngen-exec.h ---- dyngen-exec.h 12 May 2004 19:32:15 -0000 1.12 -+++ dyngen-exec.h 21 May 2004 15:00:41 -0000 -@@ -21,6 +21,8 @@ - #define __DYNGEN_EXEC_H__ - +--- qemu/dyngen-exec.h.orig 2008-03-08 20:51:30.000000000 -0600 ++++ qemu/dyngen-exec.h 2008-03-08 20:56:51.000000000 -0600 +@@ -31,6 +31,8 @@ + point because host CPU registers are used as global variables. Some + host headers do not allow that. */ #include <stddef.h> +#include <stdio.h> +#include "config.h" typedef unsigned char uint8_t; typedef unsigned short uint16_t; -@@ -54,9 +56,6 @@ - #define UINT32_MAX (4294967295U) - #define UINT64_MAX ((uint64_t)(18446744073709551615)) - --typedef struct FILE FILE; +@@ -83,9 +85,6 @@ + #else + typedef struct FILE FILE; + #endif -extern int fprintf(FILE *, const char *, ...); +-extern int fputs(const char *, FILE *); -extern int printf(const char *, ...); #undef NULL #define NULL 0 - #ifdef _BSD + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803090344.m293i2TT007369>