[oe-commits] org.oe.dev qemu_cvs.bb: Fix Makefile so CFLAGS/LDFLAGS in config.mak aren't overwritten

[daniel commit]

qemu_cvs.bb: Fix Makefile so CFLAGS/LDFLAGS in config.mak aren't overwritten

Author: daniel at openembedded.org
Branch: org.openembedded.dev
Revision: 7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e
Files:
1
packages/qemu/files/makefile.patch
packages/qemu/qemu_cvs.bb
Diffs:

#
# mt diff -r27c57b53df69b0a7ad0a9dd5da0376b841bb2a39 -r7d8bd4701e2b3328a7a4c0642bc7685d7fc7f91e
#
# 
# 
# add_file "packages/qemu/files/makefile.patch"
#  content [7b6e4a3e609da907d4026cba1f49fec3b972603d]
# 
# patch "packages/qemu/qemu_cvs.bb"
#  from [a1c43b431c24813b3186b20f390639c0b6b2fb4c]
#    to [21c0eb8c52d75f5c8ad4e17a5a96056fc7c71835]
# 
============================================================
--- packages/qemu/files/makefile.patch	7b6e4a3e609da907d4026cba1f49fec3b972603d
+++ packages/qemu/files/makefile.patch	7b6e4a3e609da907d4026cba1f49fec3b972603d
@@ -0,0 +1,37 @@
+Index: qemu/Makefile
+===================================================================
+--- qemu.orig/Makefile	2007-07-30 18:25:50.000000000 +0200
++++ qemu/Makefile	2007-07-30 18:26:13.000000000 +0200
+@@ -5,14 +5,14 @@
+ .PHONY: all clean distclean dvi info install install-doc tar tarbin \
+ 	speed test test2 html dvi info
+ 
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I.
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I.
+ ifdef CONFIG_DARWIN
+ CFLAGS+= -mdynamic-no-pic
+ endif
+ ifeq ($(ARCH),sparc)
+ CFLAGS+=-mcpu=ultrasparc
+ endif
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ TOOLS=qemu-img$(EXESUF)
+Index: qemu/Makefile.target
+===================================================================
+--- qemu.orig/Makefile.target	2007-07-30 18:27:17.000000000 +0200
++++ qemu/Makefile.target	2007-07-30 18:27:23.000000000 +0200
+@@ -17,9 +17,9 @@
+ VPATH+=:$(SRC_PATH)/linux-user
+ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
+ endif
+-CFLAGS=-Wall -O2 -g -fno-strict-aliasing
++CFLAGS+=-Wall -O2 -g -fno-strict-aliasing
+ #CFLAGS+=-Werror
+-LDFLAGS=-g
++LDFLAGS+=-g
+ LIBS=
+ HELPER_CFLAGS=$(CFLAGS)
+ DYNGEN=../dyngen$(EXESUF)
============================================================
--- packages/qemu/qemu_cvs.bb	a1c43b431c24813b3186b20f390639c0b6b2fb4c
+++ packages/qemu/qemu_cvs.bb	21c0eb8c52d75f5c8ad4e17a5a96056fc7c71835
@@ -1,12 +1,13 @@ PV = "0.8.2+cvs${SRCDATE}"
 DESCRIPTION = "Qemu is an open source processor emulator."
 HOMEPAGE = "http://fabrice.bellard.free.fr/qemu/"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.8.2+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.nongnu.org/sources/qemu;method=pserver;rsh=ssh;module=qemu \
            file://configure.patch;patch=1 \
+           file://makefile.patch;patch=1 \
            file://qemu-sdl-cursor.patch;patch=1 \
            file://arm_nptl.patch;patch=1 \
            file://pl110_rgb-r0.patch;patch=1 \