From 3523d22ec428592446a4b1e99ba1c4605764d9ee Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 25 Apr 2008 07:53:32 +0000 Subject: qemu: Move the gcc 3.4 checks to 0.9.1 only git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4335 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/qemu/qemu-native.inc | 4 +--- meta/packages/qemu/qemu-native_0.9.1.bb | 3 +++ meta/packages/qemu/qemu-sdk.inc | 2 -- meta/packages/qemu/qemu-sdk_0.9.1.bb | 4 ++++ meta/packages/qemu/qemu_svn.bb | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/meta/packages/qemu/qemu-native.inc b/meta/packages/qemu/qemu-native.inc index 8a25383c5..712da3532 100644 --- a/meta/packages/qemu/qemu-native.inc +++ b/meta/packages/qemu/qemu-native.inc @@ -1,5 +1,3 @@ inherit native -DEPENDS = "zlib-native gcc3-native" - -require qemu-gcc3-check.inc +DEPENDS = "zlib-native" diff --git a/meta/packages/qemu/qemu-native_0.9.1.bb b/meta/packages/qemu/qemu-native_0.9.1.bb index 16984a3f6..e5a94a18d 100644 --- a/meta/packages/qemu/qemu-native_0.9.1.bb +++ b/meta/packages/qemu/qemu-native_0.9.1.bb @@ -1,2 +1,5 @@ require qemu_${PV}.bb require qemu-native.inc +require qemu-gcc3-check.inc + +DEPENDS += "gcc3-native" \ No newline at end of file diff --git a/meta/packages/qemu/qemu-sdk.inc b/meta/packages/qemu/qemu-sdk.inc index f323d2546..5ecab10fa 100644 --- a/meta/packages/qemu/qemu-sdk.inc +++ b/meta/packages/qemu/qemu-sdk.inc @@ -1,5 +1,3 @@ inherit sdk DEPENDS = "zlib-sdk libsdl-sdk" RDEPENDS = "libsdl-sdk" - -require qemu-gcc3-check.inc diff --git a/meta/packages/qemu/qemu-sdk_0.9.1.bb b/meta/packages/qemu/qemu-sdk_0.9.1.bb index e93e6bb75..53640fb20 100644 --- a/meta/packages/qemu/qemu-sdk_0.9.1.bb +++ b/meta/packages/qemu/qemu-sdk_0.9.1.bb @@ -2,3 +2,7 @@ require qemu_${PV}.bb require qemu-sdk.inc EXTRA_OECONF += "--target-list=arm-linux-user,arm-softmmu" + +DEPENDS += "gcc3-native" + +require qemu-gcc3-check.inc diff --git a/meta/packages/qemu/qemu_svn.bb b/meta/packages/qemu/qemu_svn.bb index 0d15a0c3a..2feb4724d 100644 --- a/meta/packages/qemu/qemu_svn.bb +++ b/meta/packages/qemu/qemu_svn.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" DEPENDS = "zlib" PV = "0.9.1+svnr${SRCREV}" -PR = "r5" +PR = "r6" FILESPATH = "${FILE_DIRNAME}/qemu-0.9.1+svn/" -- cgit v1.2.3