From 545012d8c13e2828082ef176210b0cccdf635556 Mon Sep 17 00:00:00 2001 From: dbj Date: Tue, 14 Dec 2004 01:02:19 +0000 Subject: fixes to compile on darwin. add config.h include to target-ppc builds so _BSD is properly defined bump PKGREVISION --- emulators/qemu/Makefile | 4 ++-- emulators/qemu/distinfo | 11 ++++++----- emulators/qemu/patches/patch-aa | 16 ++++++++-------- emulators/qemu/patches/patch-af | 26 +++++++++++++++----------- emulators/qemu/patches/patch-ag | 21 +++++++++++++++------ emulators/qemu/patches/patch-aj | 20 +++++++++++++++----- emulators/qemu/patches/patch-at | 12 ++++++++++++ 7 files changed, 73 insertions(+), 37 deletions(-) create mode 100644 emulators/qemu/patches/patch-at diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 823ad58ada4..0979da4d656 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2004/12/02 11:49:57 skrll Exp $ +# $NetBSD: Makefile,v 1.5 2004/12/14 01:02:19 dbj Exp $ # DISTNAME= qemu-0.6.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://fabrice.bellard.free.fr/qemu/ diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 193507e09f0..39909c0e316 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.3 2004/11/15 15:38:15 soren Exp $ +$NetBSD: distinfo,v 1.4 2004/12/14 01:02:19 dbj Exp $ SHA1 (qemu-0.6.1.tar.gz) = 6f547082857068a3fbbac5a3d1910776d3c4b2bb Size (qemu-0.6.1.tar.gz) = 1010121 bytes -SHA1 (patch-aa) = ea16d58a6f6938432cd7ffdd745e57ff3e8bbe53 +SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24 SHA1 (patch-ac) = 2f16687e2051934a79e32e3822ee31885aa8a244 -SHA1 (patch-af) = 0ef3779e75f48e5a3b735a3cc94e5f5b753f61b3 -SHA1 (patch-ag) = a2cb1bbf450e4868a0b72216e5719559b2fd33bd +SHA1 (patch-af) = 798f4c6194b81f20c4d284f8efd2fc0b7bf68aed +SHA1 (patch-ag) = 4bb7ae18fd0f0c5ecfa2ab2594d1de5b33660495 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759 SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf -SHA1 (patch-aj) = 5917569d9d5e2bfc0f8d47522fc39efade6f8dd9 +SHA1 (patch-aj) = 2f612e652de668539e33750b87c61aae682adbfe SHA1 (patch-ak) = 7dcdbf4d010c656b8ace2d41651a18d63404e9e8 SHA1 (patch-al) = d87d8c4bd0a422b0e1c2b52d049e9ac807cf1375 SHA1 (patch-am) = b12f4ed6bbeb4d89c43ca06b3b3ff25c14386c47 @@ -18,3 +18,4 @@ SHA1 (patch-ap) = cffb474805403056706d06d4a2f01e1984cb1edf SHA1 (patch-aq) = a0fe72cfbc54086feeb5a554220df6fdc2aa063e SHA1 (patch-ar) = 2ea46ba9c333fd2e90b98dc7666bafa8c3082d42 SHA1 (patch-as) = 0df64b325b758a88fe61590e129bab2b3f99ce63 +SHA1 (patch-at) = 258e75c3229398018f9a316c070bb9ecc99bd91a diff --git a/emulators/qemu/patches/patch-aa b/emulators/qemu/patches/patch-aa index 4580f835d37..108f238991c 100644 --- a/emulators/qemu/patches/patch-aa +++ b/emulators/qemu/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ +$NetBSD: patch-aa,v 1.3 2004/12/14 01:02:19 dbj Exp $ ---- bswap.h.orig 2004-11-15 12:19:31.000000000 +0100 -+++ bswap.h 2004-11-15 12:20:25.000000000 +0100 +--- bswap.h.orig Sun Nov 14 15:51:33 2004 ++++ bswap.h @@ -5,6 +5,12 @@ #include -+#ifdef _BSD ++#ifdef HAVE_MACHINE_BSWAP_H +#include +#include +#include @@ -15,12 +15,12 @@ $NetBSD: patch-aa,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ #ifdef HAVE_BYTESWAP_H #include #else -@@ -58,6 +64,8 @@ +@@ -57,6 +63,8 @@ static inline uint64_t bswap64(uint64_t + { return bswap_64(x); } - -+#endif /* ! _BSD */ + ++#endif /* ! HAVE_MACHINE_BSWAP_H */ + static inline void bswap16s(uint16_t *s) { - *s = bswap16(*s); diff --git a/emulators/qemu/patches/patch-af b/emulators/qemu/patches/patch-af index 5ab6345105b..1d8644fdbb9 100644 --- a/emulators/qemu/patches/patch-af +++ b/emulators/qemu/patches/patch-af @@ -1,8 +1,18 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ +$NetBSD: patch-af,v 1.2 2004/12/14 01:02:19 dbj Exp $ ---- dyngen-exec.h.orig 2004-07-10 21:20:09.000000000 +0300 +--- dyngen-exec.h.orig Sun Nov 14 15:51:33 2004 +++ dyngen-exec.h -@@ -43,7 +43,7 @@ typedef signed long int64_t; +@@ -23,7 +23,9 @@ + /* NOTE: standard headers should be used with special care at this + point because host CPU registers are used as global variables. Some + host headers do not allow that. */ ++#ifndef __APPLE__ + #include ++#endif + + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; +@@ -43,7 +45,7 @@ typedef signed long int64_t; #else typedef signed long long int64_t; #endif @@ -11,7 +21,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ #define INT8_MIN (-128) #define INT16_MIN (-32767-1) #define INT32_MIN (-2147483647-1) -@@ -56,13 +56,17 @@ typedef signed long long int64_t; +@@ -56,8 +58,12 @@ typedef signed long long int64_t; #define UINT16_MAX (65535) #define UINT32_MAX (4294967295U) #define UINT64_MAX ((uint64_t)(18446744073709551615)) @@ -25,13 +35,7 @@ $NetBSD: patch-af,v 1.1.1.1 2004/11/09 13:05:34 xtraeme Exp $ extern int fprintf(FILE *, const char *, ...); extern int printf(const char *, ...); #undef NULL - #define NULL 0 --#if defined(_BSD) && !defined(__APPLE__) -+#if defined(_BSD) || !defined(__APPLE__) - #include - - #define FE_TONEAREST FP_RN -@@ -70,6 +74,7 @@ extern int printf(const char *, ...); +@@ -70,6 +76,7 @@ extern int printf(const char *, ...); #define FE_UPWARD FP_RP #define FE_TOWARDZERO FP_RZ #define fesetround(x) fpsetround(x) diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag index 0162a544d5b..6a0fd5ba2ad 100644 --- a/emulators/qemu/patches/patch-ag +++ b/emulators/qemu/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ +$NetBSD: patch-ag,v 1.3 2004/12/14 01:02:19 dbj Exp $ ---- configure.orig 2004-11-15 11:51:55.000000000 +0100 -+++ configure 2004-11-15 11:53:18.000000000 +0100 -@@ -259,7 +259,7 @@ +--- configure.orig Sun Nov 14 15:51:33 2004 ++++ configure +@@ -259,7 +259,7 @@ aa="no" `$sdl_config --static-libs | grep \\\-laa > /dev/null` && aa="yes" sdl_static_libs=`$sdl_config --static-libs` if [ "$aa" = "yes" ] ; then @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ fi if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then -@@ -314,7 +314,7 @@ +@@ -314,7 +314,7 @@ else if test -z "$prefix" ; then prefix="/usr/local" fi @@ -20,7 +20,16 @@ $NetBSD: patch-ag,v 1.2 2004/11/15 11:35:30 xtraeme Exp $ datadir="$prefix/share/qemu" docdir="$prefix/share/doc/qemu" bindir="$prefix/bin" -@@ -566,7 +566,7 @@ +@@ -423,6 +423,8 @@ if test "$mingw32" = "yes" ; then + echo "#define CONFIG_WIN32 1" >> $config_h + elif test -f "/usr/include/byteswap.h" ; then + echo "#define HAVE_BYTESWAP_H 1" >> $config_h ++elif test -f "/usr/include/machine/bswap.h" ; then ++ echo "#define HAVE_MACHINE_BSWAP_H 1" >> $config_h + fi + if test "$darwin" = "yes" ; then + echo "CONFIG_DARWIN=yes" >> $config_mak +@@ -566,7 +568,7 @@ if test "$target_user_only" = "no"; then fi echo -n "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_mak if [ "${aa}" = "yes" ] ; then diff --git a/emulators/qemu/patches/patch-aj b/emulators/qemu/patches/patch-aj index 3578af9cce0..d972ebf598e 100644 --- a/emulators/qemu/patches/patch-aj +++ b/emulators/qemu/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1.1.1 2004/11/09 13:05:33 xtraeme Exp $ +$NetBSD: patch-aj,v 1.2 2004/12/14 01:02:19 dbj Exp $ ---- Makefile.target.orig 2004-11-09 13:20:37.000000000 +0100 -+++ Makefile.target 2004-11-09 13:22:17.000000000 +0100 -@@ -7,8 +7,8 @@ +--- Makefile.target.orig Sun Nov 14 15:51:33 2004 ++++ Makefile.target +@@ -7,8 +7,8 @@ ifdef CONFIG_USER_ONLY VPATH+=:$(SRC_PATH)/linux-user DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif @@ -13,7 +13,17 @@ $NetBSD: patch-aj,v 1.1.1.1 2004/11/09 13:05:33 xtraeme Exp $ LIBS= HELPER_CFLAGS=$(CFLAGS) DYNGEN=../dyngen$(EXESUF) -@@ -340,7 +340,7 @@ +@@ -181,6 +181,9 @@ endif + + DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + LIBS+=-lm ++ifdef CONFIG_DARWIN ++LIBS+=-lmx ++endif + ifndef CONFIG_USER_ONLY + LIBS+=-lz + endif +@@ -397,7 +400,7 @@ clean: install: all ifneq ($(PROGS),) diff --git a/emulators/qemu/patches/patch-at b/emulators/qemu/patches/patch-at new file mode 100644 index 00000000000..cef3728a21f --- /dev/null +++ b/emulators/qemu/patches/patch-at @@ -0,0 +1,12 @@ +$NetBSD: patch-at,v 1.1 2004/12/14 01:02:19 dbj Exp $ + +--- target-ppc/exec.h.orig Sun Nov 14 15:51:33 2004 ++++ target-ppc/exec.h +@@ -20,6 +20,7 @@ + #if !defined (__PPC_H__) + #define __PPC_H__ + ++#include "config.h" + #include "dyngen-exec.h" + + register struct CPUPPCState *env asm(AREG0); -- cgit v1.2.3