[oe-commits] org.oe.dev merge of '27baa018f9f9e77156f5eb95353722f773cc651d'

[hrw commit]

merge of '27baa018f9f9e77156f5eb95353722f773cc651d'
     and 'a61caf645adcb41a0f8ba344818d237040ae0bc9'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: bec79f6189558adada5ebd875b63a2c71daf9d45
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bec79f6189558adada5ebd875b63a2c71daf9d45
Files:
1
packages/qemu/files/no-strip.patch
packages/qemu/qemu_20070613.bb
packages/qemu/qemu-native_20070613.bb
Diffs:

#
# mt diff -r27baa018f9f9e77156f5eb95353722f773cc651d -rbec79f6189558adada5ebd875b63a2c71daf9d45
#
# 
# 
# add_file "packages/qemu/files/no-strip.patch"
#  content [e50ada97aea32904dde176f41b8ca86f89b5ca65]
# 
# patch "packages/qemu/qemu_20070613.bb"
#  from [d169cbb6915972578e9e84fa7709e27d7381c6a7]
#    to [08e188f8fc9c503ecd5a07df1479a19a1531b34e]
# 
============================================================
--- packages/qemu/files/no-strip.patch	e50ada97aea32904dde176f41b8ca86f89b5ca65
+++ packages/qemu/files/no-strip.patch	e50ada97aea32904dde176f41b8ca86f89b5ca65
@@ -0,0 +1,22 @@
+--- qemu.orig/Makefile
++++ qemu/Makefile
+@@ -68,7 +68,7 @@
+ 
+ install: all $(if $(BUILD_DOCS),install-doc)
+ 	mkdir -p "$(DESTDIR)$(bindir)"
+-	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
++	$(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
+ 	mkdir -p "$(DESTDIR)$(datadir)"
+ 	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
+ 		video.x openbios-sparc32 pxe-ne2k_pci.bin \
+--- qemu.orig/Makefile.target
++++ qemu/Makefile.target
+@@ -655,7 +655,7 @@
+ 
+ install: all 
+ ifneq ($(PROGS),)
+-	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
++	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+ endif
+ 
+ ifneq ($(wildcard .depend),)
============================================================
--- packages/qemu/qemu_20070613.bb	d169cbb6915972578e9e84fa7709e27d7381c6a7
+++ packages/qemu/qemu_20070613.bb	08e188f8fc9c503ecd5a07df1479a19a1531b34e
@@ -1,8 +1,8 @@ PV = "0.9.0+cvs${SRCDATE}"
 LICENSE = "GPL"
 DEPENDS = "zlib"
 SRCDATE = "20070613"
 PV = "0.9.0+cvs${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 FILESDIR = "${WORKDIR}"
 
@@ -34,7 +34,8 @@ SRC_URI = "\
     file://qemu-0.9.0-nptl-update.patch;patch=1 \
     file://qemu-amd64-32b-mapping-0.9.0.patch;patch=1 \
     file://workaround_bad_futex_headers.patch;patch=1 \
-    file://fix_segfault.patch;patch=1"
+    file://fix_segfault.patch;patch=1 \
+    file://no-strip.patch;patch=1"
 
 #    svn://svn.o-hand.com/repos/misc/trunk/qemu-packaging/qemu;module=debian;proto=http;srcdate=20070119 \
 #    file://debian/patches/21_net_soopts.patch;patch=1;pnum=0 \


#
# mt diff -ra61caf645adcb41a0f8ba344818d237040ae0bc9 -rbec79f6189558adada5ebd875b63a2c71daf9d45
#
# 
# 
# patch "packages/qemu/qemu-native_20070613.bb"
#  from [70c6b769cb660de1a7f33749cd3338f4a948782e]
#    to [342f872dda508387c0cfd231275c9f7fa10f3a9e]
# 
============================================================
--- packages/qemu/qemu-native_20070613.bb	70c6b769cb660de1a7f33749cd3338f4a948782e
+++ packages/qemu/qemu-native_20070613.bb	342f872dda508387c0cfd231275c9f7fa10f3a9e
@@ -8,7 +8,9 @@ python __anonymous() {
 	
     path = data.getVar('PATH', d)
     oeconf = data.getVar('EXTRA_OECONF', d) or ''
-    if len(which(path, 'gcc-3.4')) != 0:
+    if len(which(path, 'gcc-3.4.6')) != 0:
+        data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.4.6", d)
+    elif len(which(path, 'gcc-3.4')) != 0:
         data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc-3.4", d)
     elif len(which(path, 'gcc34')) != 0:
         data.setVar('EXTRA_OECONF', oeconf + " --cc=gcc34", d)