diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-05 12:41:10 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-05-05 12:41:10 +0000 |
| commit | 8ca48ff8979e6c7a1377bf6d55a9dc0a230c29c5 (patch) | |
| tree | 3916ca087ea065ad456125c7b5bc216c73253ce6 /emulators/qemu-devel/files/patch-fbsd | |
| parent | - update to 1.29 (diff) | |
- Update to 2005-05-02 snapshot
- Add kqemu support
PR: ports/80595
Submitted by: Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=134652
Diffstat (limited to 'emulators/qemu-devel/files/patch-fbsd')
| -rw-r--r-- | emulators/qemu-devel/files/patch-fbsd | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/emulators/qemu-devel/files/patch-fbsd b/emulators/qemu-devel/files/patch-fbsd index dab1f93fc8a0..76e950045de7 100644 --- a/emulators/qemu-devel/files/patch-fbsd +++ b/emulators/qemu-devel/files/patch-fbsd @@ -8,14 +8,19 @@ Index: qemu/Makefile for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ done -@@ -25,6 +25,9 @@ +@@ -21,10 +21,13 @@ + ifdef CONFIG_WIN32 + $(MAKE) -C kqemu -f Makefile.winnt + else +- $(MAKE) -C kqemu ++ cd kqemu && $(BSD_MAKE) endif endif +bsd/libmath.a: + ( cd bsd ; $(BSD_MAKE) CC=$(CC) ) + - qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c + qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) @@ -33,6 +36,7 @@ @@ -26,6 +31,25 @@ Index: qemu/Makefile rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS *.pod *~ */*~ $(MAKE) -C tests clean +@@ -40,7 +44,7 @@ + $(MAKE) -C $$d $@ || exit 1 ; \ + done + ifdef CONFIG_KQEMU +- $(MAKE) -C kqemu clean ++ cd kqemu && $(BSD_MAKE) clean + endif + + distclean: clean +@@ -73,9 +77,6 @@ + for d in $(TARGET_DIRS); do \ + $(MAKE) -C $$d $@ || exit 1 ; \ + done +-ifdef CONFIG_KQEMU +- cd kqemu ; ./install.sh +-endif + + # various test targets + test speed test2: all Index: qemu/Makefile.target @@ -391,8 +391,8 @@ VL_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld |