From 29936f26a7de901431676b33cf8d4e5bc92d07ef Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 29 Apr 2006 16:50:12 +0000
Subject: qemu cvs: Disable document generation and also use any gcc-3.4 or
 gcc-3.3 in preference to gcc if present for qemu-native

---
 packages/qemu/files/nodocs_cvs.patch | 44 ++++++++++++++++++++++++++++++++++++
 packages/qemu/qemu-native_cvs.bb     | 10 ++++++++
 packages/qemu/qemu_cvs.bb            |  1 +
 3 files changed, 55 insertions(+)
 create mode 100644 packages/qemu/files/nodocs_cvs.patch

diff --git a/packages/qemu/files/nodocs_cvs.patch b/packages/qemu/files/nodocs_cvs.patch
new file mode 100644
index 0000000000..b52d860fb0
--- /dev/null
+++ b/packages/qemu/files/nodocs_cvs.patch
@@ -0,0 +1,44 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile	2006-04-18 11:11:37.000000000 +0100
++++ qemu/Makefile	2006-04-18 11:14:34.000000000 +0100
+@@ -11,7 +11,7 @@
+ ifdef CONFIG_STATIC
+ LDFLAGS+=-static
+ endif
+-DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1
++DOCS=
+ 
+ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
+ 	for d in $(TARGET_DIRS); do \
+@@ -51,11 +51,11 @@
+ 			video.x proll.elf linux_boot.bin; do \
+ 		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+ 	done
+-	mkdir -p "$(DESTDIR)$(docdir)"
+-	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
++#	mkdir -p "$(DESTDIR)$(docdir)"
++#	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+ ifndef CONFIG_WIN32
+-	mkdir -p "$(DESTDIR)$(mandir)/man1"
+-	$(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
++#	mkdir -p "$(DESTDIR)$(mandir)/man1"
++#	$(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+ 	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
+ 	for x in $(KEYMAPS); do \
+ 		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+@@ -122,10 +122,10 @@
+ 	$(datadir)/ppc_rom.bin \
+ 	$(datadir)/video.x \
+ 	$(datadir)/proll.elf \
+-	$(datadir)/linux_boot.bin \
+-	$(docdir)/qemu-doc.html \
+-	$(docdir)/qemu-tech.html \
+-	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
++	$(datadir)/linux_boot.bin
++#	$(docdir)/qemu-doc.html \
++#	$(docdir)/qemu-tech.html \
++#	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
diff --git a/packages/qemu/qemu-native_cvs.bb b/packages/qemu/qemu-native_cvs.bb
index 07b9dae420..976d2d664f 100644
--- a/packages/qemu/qemu-native_cvs.bb
+++ b/packages/qemu/qemu-native_cvs.bb
@@ -2,3 +2,13 @@ include qemu_cvs.bb
 inherit native
 prefix = "${STAGING_DIR}/${BUILD_SYS}"
 
+python __anonymous() {
+    from bb import which, data
+	
+    path = data.getVar('PATH', d)
+    if len(which(path, 'gcc-3.4')) != 0:
+        data.setVar('EXTRA_OECONF', " --cc=gcc-3.4", d)
+    elif len(which(path, 'gcc-3.3')) != 0:
+        data.setVar('EXTRA_OECONF', " --cc=gcc-3.3", d)
+
+}
diff --git a/packages/qemu/qemu_cvs.bb b/packages/qemu/qemu_cvs.bb
index 88c18c3b6d..5ebc18c6a4 100644
--- a/packages/qemu/qemu_cvs.bb
+++ b/packages/qemu/qemu_cvs.bb
@@ -2,6 +2,7 @@ LICENSE = "GPL"
 PV = "0.8.0+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
+           file://nodocs_cvs.patch;patch=1 \
            file://configure.patch;patch=1"
 
 S = "${WORKDIR}/qemu"
-- 
cgit v1.2.3