cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ff14b4c7c3
openbsd-ports/emulators/qemu/patches/patch-Makefile_target

83 lines
2.0 KiB
Plaintext
Raw Normal View History

o update to 0.9.1, lots from brad@ o see http://qemu.org/changelog.html for details o see README.OpenBSD for an intro to qemu on OpenBSD o disable broken arm host support for now
2008-04-28 18:52:38 -04:00
$OpenBSD: patch-Makefile_target,v 1.12 2008/04/28 22:52:38 todd Exp $
--- Makefile.target.orig Sun Jan 6 14:38:41 2008
+++ Makefile.target Wed Apr 9 23:28:03 2008
@@ -136,11 +136,11 @@ endif
endif
endif
-ifeq ($(ARCH),x86_64)
- ifneq ($(CONFIG_SOLARIS),yes)
- BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
- endif
-endif
+#ifeq ($(ARCH),x86_64)
+# ifneq ($(CONFIG_SOLARIS),yes)
+# BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
+# endif
+#endif
ifeq ($(ARCH),ppc)
CPPFLAGS+= -D__powerpc__
@@ -188,7 +188,7 @@ BASE_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/$(ARCH).ld
update to 0.8.0, see qemu.org for full ChangeLog for OpenBSD, amd64 simulation on i386 appars to work ok now
2005-12-27 02:56:14 -05:00
endif
ifeq ($(ARCH),arm)
update to 0.9.0, thanks to all who gave feedback see http://qemu.org/changelog.html for details new in OpenBSD, support for raw block devices
2007-05-01 08:55:13 -04:00
-OP_CFLAGS+=-mno-sched-prolog -fno-omit-frame-pointer
+OP_CFLAGS+=-mno-sched-prolog -fno-omit-frame-pointer -mapcs-frame
BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
update to 0.8.0, see qemu.org for full ChangeLog for OpenBSD, amd64 simulation on i386 appars to work ok now
2005-12-27 02:56:14 -05:00
endif
o update to 0.9.1, lots from brad@ o see http://qemu.org/changelog.html for details o see README.OpenBSD for an intro to qemu on OpenBSD o disable broken arm host support for now
2008-04-28 18:52:38 -04:00
@@ -215,6 +215,16 @@ BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld
endif
Import qemu snapshot from 2005-02-27 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. QEMU has two operating modes: * Full system emulation. In this mode, QEMU emulates a full system (for example a PC), including a processor and various peripherials. It can be used to launch different Operating Systems without rebooting the PC or to debug system code. * User mode emulation (Linux host only). In this mode, .. many thanks for feedback from many people, and for Lars Hansson and Michael Schmidt for posting early work on the port of qemu to ports@ For now, only for macppc and i386, as these are currently the only archs that have reported success building qemu. QEMU can launch Linux processes compiled for one CPU on another CPU.
2005-03-07 11:41:28 -05:00
endif
o add patch to permit osx x86 guest to run o fix Makefile.target to add -fno-stack-protector for op.o for all archs, noted, debugged, and tested by Antoine Jacoutot on macppc, thanks! o bump PKGNAME
2005-09-26 16:47:56 -04:00
+# Very important for this 'ifeq' block to be after other
+# OP_CFLAGS= .. constructs above
Import qemu snapshot from 2005-02-27 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. QEMU has two operating modes: * Full system emulation. In this mode, QEMU emulates a full system (for example a PC), including a processor and various peripherials. It can be used to launch different Operating Systems without rebooting the PC or to debug system code. * User mode emulation (Linux host only). In this mode, .. many thanks for feedback from many people, and for Lars Hansson and Michael Schmidt for posting early work on the port of qemu to ports@ For now, only for macppc and i386, as these are currently the only archs that have reported success building qemu. QEMU can launch Linux processes compiled for one CPU on another CPU.
2005-03-07 11:41:28 -05:00
+ifeq ($(shell uname -s),OpenBSD)
+OP_CFLAGS+= -fno-stack-protector
+endif
+
o update to 0.9.1, lots from brad@ o see http://qemu.org/changelog.html for details o see README.OpenBSD for an intro to qemu on OpenBSD o disable broken arm host support for now
2008-04-28 18:52:38 -04:00
+ifdef CONFIG_OSS_LIBRARY
+LIBS+=-lossaudio
+endif
+
ifeq ($(CONFIG_DARWIN),yes)
LIBS+=-lmx
endif
@@ -232,6 +242,7 @@ OP_LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS)
update to 0.7.1 (http://qemu.org/changelog.html) add pcnet nic support
2005-08-10 21:15:17 -04:00
#########################################################
update to 0.9.0, thanks to all who gave feedback see http://qemu.org/changelog.html for details new in OpenBSD, support for raw block devices
2007-05-01 08:55:13 -04:00
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+#CPPFLAGS+= -DDEBUG_GDB -DDEBUG -DDEBUG_KBD -DDEBUG_MOUSE
update to 0.7.1 (http://qemu.org/changelog.html) add pcnet nic support
2005-08-10 21:15:17 -04:00
LIBS+=-lm
ifndef CONFIG_USER_ONLY
LIBS+=-lz
o update to 0.9.1, lots from brad@ o see http://qemu.org/changelog.html for details o see README.OpenBSD for an intro to qemu on OpenBSD o disable broken arm host support for now
2008-04-28 18:52:38 -04:00
@@ -537,7 +548,7 @@ endif
update qemu to 0.8.2, from brad@ See http://fabrice.bellard.free.fr/qemu/changelog.html for details.
2006-12-22 12:31:45 -05:00
ifndef CONFIG_DARWIN
ifndef CONFIG_WIN32
ifndef CONFIG_SOLARIS
o update to 0.9.1, lots from brad@ o see http://qemu.org/changelog.html for details o see README.OpenBSD for an intro to qemu on OpenBSD o disable broken arm host support for now
2008-04-28 18:52:38 -04:00
-VL_LIBS+=-lutil
+#VL_LIBS+=-lutil
endif
update qemu to 0.8.2, from brad@ See http://fabrice.bellard.free.fr/qemu/changelog.html for details.
2006-12-22 12:31:45 -05:00
endif
from Andrew Dalgleish openbsd at ajd dot net dot au o sample qemu-ifup o permit -net tap,ifname=/dev/tun1 to actually use tun1 from Reyk Floeter reyk at openbsd dot org o re-enable pcnet bump PKGNAME
2006-02-16 11:27:44 -05:00
endif
o update to 0.9.1, lots from brad@ o see http://qemu.org/changelog.html for details o see README.OpenBSD for an intro to qemu on OpenBSD o disable broken arm host support for now
2008-04-28 18:52:38 -04:00
@@ -557,12 +568,12 @@ ifeq ($(ARCH),sparc64)
endif
Import qemu snapshot from 2005-02-27 QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation. QEMU has two operating modes: * Full system emulation. In this mode, QEMU emulates a full system (for example a PC), including a processor and various peripherials. It can be used to launch different Operating Systems without rebooting the PC or to debug system code. * User mode emulation (Linux host only). In this mode, .. many thanks for feedback from many people, and for Lars Hansson and Michael Schmidt for posting early work on the port of qemu to ports@ For now, only for macppc and i386, as these are currently the only archs that have reported success building qemu. QEMU can launch Linux processes compiled for one CPU on another CPU.
2005-03-07 11:41:28 -05:00
endif
o update to 0.9.1, lots from brad@ o see http://qemu.org/changelog.html for details o see README.OpenBSD for an intro to qemu on OpenBSD o disable broken arm host support for now
2008-04-28 18:52:38 -04:00
-ifeq ($(ARCH),x86_64)
- VL_LDFLAGS+=-m64
- ifneq ($(CONFIG_SOLARIS),yes)
- VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
- endif
-endif
+#ifeq ($(ARCH),x86_64)
+# VL_LDFLAGS+=-m64
+# ifneq ($(CONFIG_SOLARIS),yes)
+# VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
+# endif
+#endif
ifdef CONFIG_WIN32
SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
Reference in New Issue Copy Permalink