summaryrefslogtreecommitdiff
path: root/emulators/qemu-devel/files/patch-fbsd
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2008-03-11 23:34:14 +0000
committerJuergen Lock <nox@FreeBSD.org>2008-03-11 23:34:14 +0000
commitcf1bcdae1c1c5616cbea6ab4e3569cbbaeff4bf7 (patch)
tree4008eebb14731e300053ac880e1c21209ad9f51b /emulators/qemu-devel/files/patch-fbsd
parent- Fix typo (unclosed double-quote) (diff)
- Update to 2008-03-02 snapshot [1]
- Fix unchecked block read/write vulnerability [2] Submitted by: nox [1] Obtained from: qemu cvs [2] Security: http://www.vuxml.org/freebsd/9cfbca7f-efb7-11dc-be01-0211060005df.html
Notes
Notes: svn path=/head/; revision=208861
Diffstat (limited to 'emulators/qemu-devel/files/patch-fbsd')
-rw-r--r--emulators/qemu-devel/files/patch-fbsd16
1 files changed, 8 insertions, 8 deletions
diff --git a/emulators/qemu-devel/files/patch-fbsd b/emulators/qemu-devel/files/patch-fbsd
index 1fccf8b7cfe7..2492e0a4ea4c 100644
--- a/emulators/qemu-devel/files/patch-fbsd
+++ b/emulators/qemu-devel/files/patch-fbsd
@@ -20,17 +20,17 @@ Index: qemu/Makefile
rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~
$(MAKE) -C tests clean
Index: qemu/Makefile.target
-@@ -465,8 +465,8 @@
- SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+@@ -649,8 +649,8 @@
+ main.o: CFLAGS+=-p
endif
--$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
-- $(CC) $(VL_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS)
-+$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a ../bsd/libmath.a
-+ $(CC) $(VL_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) ../bsd/libmath.a
+-$(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
+- $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS)
++$(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a ../bsd/libmath.a
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) ../bsd/libmath.a
+
+ endif # !CONFIG_USER_ONLY
- cocoa.o: cocoa.m
- $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
Index: qemu/fpu/softfloat-native.c
@@ -2,11 +2,16 @@
context is supported */