Patchwork sanity, base: remove gcc3 check since qemu doesn't need it any more

login
register
mail settings
Submitter Phil Blundell
Date July 14, 2011, 3:24 p.m.
Message ID <1310657092.2378.67.camel@phil-desktop>
Download mbox | patch
Permalink /patch/7599/
State New, archived
Headers show

Comments

Phil Blundell - July 14, 2011, 3:24 p.m.
Recent versions of qemu seem to be happy enough building with gcc 4.x, and indeed most modern distributions aren't shipping gcc3 any more, so there is no point checking for its presence as part of sanity.

Also remove the check_gcc3 function from base since nothing else uses it.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/classes/base.bbclass   |   10 ----------
 meta/classes/sanity.bbclass |    8 --------
 2 files changed, 0 insertions(+), 18 deletions(-)
Saul Wold - July 19, 2011, 6:44 p.m.
On 07/14/2011 08:24 AM, Phil Blundell wrote:
> Recent versions of qemu seem to be happy enough building with gcc 4.x, and indeed most modern distributions aren't shipping gcc3 any more, so there is no point checking for its presence as part of sanity.
>
> Also remove the check_gcc3 function from base since nothing else uses it.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   meta/classes/base.bbclass   |   10 ----------
>   meta/classes/sanity.bbclass |    8 --------
>   2 files changed, 0 insertions(+), 18 deletions(-)
>
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 0c2c546..3ca4e47 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -397,16 +397,6 @@ python () {
>               bb.warn("Recipe %s is marked as only being architecture specific but seems to have machine specific packages?! The recipe may as well mark itself as machine specific directly." % d.getVar("PN", True))
>   }
>
> -def check_gcc3(data):
> -
> -	gcc3_versions = 'gcc-3.4.6 gcc-3.4.7 gcc-3.4 gcc34 gcc-3.4.4 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32'
> -
> -	for gcc3 in gcc3_versions.split():
> -		if check_app_exists(gcc3, data):
> -			return gcc3
> -	
> -	return False
> -
>   addtask cleansstate after do_clean
>   python do_cleansstate() {
>           sstate_clean_cachefiles(d)
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index c9d37c9..716b158 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -211,14 +211,6 @@ def check_sanity(e):
>
>       required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget cpio"
>
> -    # qemu-native needs gcc 3.x
> -    if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided:
> -        gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
> -
> -        if not check_gcc3(e.data) and gcc_version[0] != '3':
> -            messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH"
> -            missing = missing + "gcc-3.x (needed for qemu-native),"
> -
>       if "qemu-native" in assume_provided:
>           if not check_app_exists("qemu-arm", e.data):
>               messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0c2c546..3ca4e47 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -397,16 +397,6 @@  python () {
             bb.warn("Recipe %s is marked as only being architecture specific but seems to have machine specific packages?! The recipe may as well mark itself as machine specific directly." % d.getVar("PN", True))
 }
 
-def check_gcc3(data):
-
-	gcc3_versions = 'gcc-3.4.6 gcc-3.4.7 gcc-3.4 gcc34 gcc-3.4.4 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32'
-
-	for gcc3 in gcc3_versions.split():
-		if check_app_exists(gcc3, data):
-			return gcc3
-	
-	return False
-
 addtask cleansstate after do_clean
 python do_cleansstate() {
         sstate_clean_cachefiles(d)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index c9d37c9..716b158 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -211,14 +211,6 @@  def check_sanity(e):
 
     required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk hg chrpath wget cpio"
 
-    # qemu-native needs gcc 3.x
-    if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided:
-        gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
-
-        if not check_gcc3(e.data) and gcc_version[0] != '3':
-            messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH"
-            missing = missing + "gcc-3.x (needed for qemu-native),"
-
     if "qemu-native" in assume_provided:
         if not check_app_exists("qemu-arm", e.data):
             messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"