From 575502bc13b27ff07add178a914520a29d4d8872 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 30 Dec 2007 17:12:44 +0000 Subject: Fix build on DragonFly. From Rumko based on patch from Patrick Georgi. --- emulators/qemu/distinfo | 8 +++++--- emulators/qemu/patches/patch-ab | 28 ++++++++++++++++++++++++++ emulators/qemu/patches/patch-ad | 15 ++++++++++++++ emulators/qemu/patches/patch-ag | 44 +++++++++++++++++++++++++++++++++-------- emulators/qemu/patches/patch-ak | 19 +++++++++++++++--- 5 files changed, 100 insertions(+), 14 deletions(-) create mode 100644 emulators/qemu/patches/patch-ab create mode 100644 emulators/qemu/patches/patch-ad diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 5ee07e20a00..776884772a9 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.35 2007/12/24 10:18:22 apb Exp $ +$NetBSD: distinfo,v 1.36 2007/12/30 17:12:44 joerg Exp $ SHA1 (qemu-0.9.0.tar.gz) = 1e57e48a06eb8729913d92601000466eecef06cb RMD160 (qemu-0.9.0.tar.gz) = 4296542b6da18a6ac93d20787330d3c1c2ac0a19 Size (qemu-0.9.0.tar.gz) = 1901741 bytes SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24 +SHA1 (patch-ab) = 29870b0bec5f9fa08267dfb9208d75d1d735714a SHA1 (patch-ac) = f3f37f2e72de28077a6579b12ecb2ea6650eea85 -SHA1 (patch-ag) = 91f10c4556a45ca3ec19efe67dcaa6625902c120 -SHA1 (patch-ak) = 004f47719cd533354162c336da833c20a2b288af +SHA1 (patch-ad) = ac69a03e4945e8c8fd5aadca070b876d0970910d +SHA1 (patch-ag) = 8480b6f840bcad845d76df996f913d2ad6750b8c +SHA1 (patch-ak) = 11669ec0ac62c0c90b7d2bfecb1f6efe3cb82fd2 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9 SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0 SHA1 (patch-au) = 8dec416dcff966ecf23bd8cb7904ab5bed22d08a diff --git a/emulators/qemu/patches/patch-ab b/emulators/qemu/patches/patch-ab new file mode 100644 index 00000000000..9e4ede5168e --- /dev/null +++ b/emulators/qemu/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.8 2007/12/30 17:12:44 joerg Exp $ + +--- Makefile.target.orig 2007-02-05 23:01:54 +0000 ++++ Makefile.target +@@ -72,6 +72,10 @@ endif + # We require -O2 to avoid the stack setup prologue in EXIT_TB + OP_CFLAGS = -Wall -O2 -g -fno-strict-aliasing + ++ifdef STACK_PROTECTOR_PRESENT ++OP_CFLAGS += -fno-stack-protector ++endif ++ + ifeq ($(ARCH),i386) + HELPER_CFLAGS+=-fomit-frame-pointer + OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer +@@ -440,10 +444,12 @@ endif + ifndef CONFIG_DARWIN + ifndef CONFIG_WIN32 + ifndef CONFIG_SOLARIS ++ifndef CONFIG_DRAGONFLY + VL_LIBS=-lutil -lrt + endif + endif + endif ++endif + ifdef TARGET_GPROF + vl.o: BASE_CFLAGS+=-p + VL_LDFLAGS+=-p diff --git a/emulators/qemu/patches/patch-ad b/emulators/qemu/patches/patch-ad new file mode 100644 index 00000000000..5335c36a228 --- /dev/null +++ b/emulators/qemu/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.3 2007/12/30 17:12:45 joerg Exp $ + +--- block.c.orig 2007-02-05 23:01:54 +0000 ++++ block.c +@@ -29,8 +29,10 @@ + #include + #include + #include ++#ifndef __DragonFly__ + #include + #endif ++#endif + + #define SECTOR_BITS 9 + #define SECTOR_SIZE (1 << SECTOR_BITS) diff --git a/emulators/qemu/patches/patch-ag b/emulators/qemu/patches/patch-ag index 7aea34e0c94..9e3b57bbe20 100644 --- a/emulators/qemu/patches/patch-ag +++ b/emulators/qemu/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $ +$NetBSD: patch-ag,v 1.9 2007/12/30 17:12:45 joerg Exp $ ---- configure.orig 2006-12-07 16:59:57.000000000 +0100 -+++ configure 2006-12-07 17:02:12.000000000 +0100 -@@ -27,7 +27,7 @@ +--- configure.orig 2007-02-05 23:01:54 +0000 ++++ configure +@@ -29,7 +29,7 @@ ar="ar" make="make" install="install" strip="strip" @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $ target_list="" case "$cpu" in i386|i486|i586|i686|i86pc|BePC) -@@ -42,7 +42,7 @@ +@@ -44,7 +44,7 @@ case "$cpu" in alpha) cpu="alpha" ;; @@ -20,7 +20,7 @@ $NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $ cpu="powerpc" ;; mips) -@@ -115,6 +115,12 @@ +@@ -116,6 +116,12 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64 kqemu="yes" fi ;; @@ -33,7 +33,24 @@ $NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $ NetBSD) bsd="yes" oss="yes" -@@ -509,7 +515,7 @@ +@@ -371,6 +377,16 @@ EOF + fi + fi + ++# Check for stack protector ++cat > $TMPC < /dev/null ; then ++ stack_protector_present="no" ++else ++ stack_protector_present="yes" ++fi ++ + # + # Solaris specific configure tool chain decisions + # +@@ -573,7 +589,7 @@ else if test -z "$prefix" ; then prefix="/usr/local" fi @@ -42,7 +59,7 @@ $NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $ datadir="$prefix/share/qemu" docdir="$prefix/share/doc/qemu" bindir="$prefix/bin" -@@ -646,6 +652,11 @@ +@@ -711,6 +727,11 @@ 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 @@ -54,3 +71,14 @@ $NetBSD: patch-ag,v 1.8 2007/01/06 21:21:35 xtraeme Exp $ fi if test "$darwin" = "yes" ; then echo "CONFIG_DARWIN=yes" >> $config_mak +@@ -785,6 +806,10 @@ if [ "$bsd" = "yes" ] ; then + echo "#define _BSD 1" >> $config_h + fi + ++if [ "$stack_protector_present" = "yes" ] ; then ++ echo "STACK_PROTECTOR_PRESENT=yes" >> $config_mak ++fi ++ + echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h + + for target in $target_list; do diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak index 3be6dc11ff5..e58757180b4 100644 --- a/emulators/qemu/patches/patch-ak +++ b/emulators/qemu/patches/patch-ak @@ -1,8 +1,21 @@ -$NetBSD: patch-ak,v 1.11 2007/12/18 00:16:56 joerg Exp $ +$NetBSD: patch-ak,v 1.12 2007/12/30 17:12:45 joerg Exp $ ---- Makefile.orig 2007-02-06 00:01:54.000000000 +0100 +--- Makefile.orig 2007-02-05 23:01:54 +0000 +++ Makefile -@@ -66,21 +66,21 @@ ar de en-us fi fr-be hr +@@ -27,10 +27,12 @@ endif + ifndef CONFIG_DARWIN + ifndef CONFIG_WIN32 + ifndef CONFIG_SOLARIS ++ifndef CONFIG_DRAGONFLY + LIBS+=-lrt + endif + endif + endif ++endif + + all: $(TOOLS) $(DOCS) recurse-all + +@@ -66,21 +68,21 @@ ar de en-us fi fr-be hr common de-ch es fo fr-ca hu ja mk nl-be pt sl tr install-doc: $(DOCS) -- cgit v1.2.3