From 7377bcfa7701f0d9b88d5d312b40d356b0f0e018 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Jan 2008 15:23:12 +0000 Subject: base and sanity bbclasses + qemu: move gcc3 availability checking into base.bbclass (from Poky) --- classes/base.bbclass | 17 +++++++++++++++++ classes/sanity.bbclass | 8 -------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 2b508a8e84..e0b4c59e5f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -902,6 +902,23 @@ python () { base_after_parse(d) } +def check_app_exists(app, d): + from bb import which, data + + app = data.expand(app, d) + path = data.getVar('PATH', d) + return len(which(path, app)) != 0 + +def check_gcc3(data): + + gcc3_versions = 'gcc-3.4 gcc34 gcc-3.4.4 gcc-3.4.6 gcc-3.4.7 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 + # Patch handling inherit patch diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index cc413b7011..9994febf0d 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -24,14 +24,6 @@ def check_conf_exists(fn, data): return True return False -def check_app_exists(app, d): - from bb import which, data - - app = data.expand(app, d) - path = data.getVar('PATH', d) - return len(which(path, app)) != 0 - - def check_sanity(e): from bb import note, error, data, __version__ from bb.event import Handled, NotHandled, getName -- cgit v1.2.3 From 3742113ef49b7a6cabce2f484f856e34a935df77 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 6 Jan 2008 17:59:08 +0000 Subject: base.bbclass: Expand path when searching for applications (else it can contain unexpanded entries and applications in staging don't get found for example) --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index e0b4c59e5f..d48d2a5726 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -906,7 +906,7 @@ def check_app_exists(app, d): from bb import which, data app = data.expand(app, d) - path = data.getVar('PATH', d) + path = data.getVar('PATH', d, 1) return len(which(path, app)) != 0 def check_gcc3(data): -- cgit v1.2.3 From b7bc13c6bdeb14a3e44b1e799d84f77be35dd463 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 6 Jan 2008 23:03:37 +0000 Subject: classes/sanity.bbclass: We need GNU fortran installed to build the gcc4.2 cross compiler --- classes/sanity.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 9994febf0d..fb2d058610 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -83,6 +83,9 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," + if not check_app_exists('${BUILD_PREFIX}gfortran', e.data): + missing = mising + "GNU Fortran Compiler" + required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" for util in required_utilities.split(): -- cgit v1.2.3 From b9563cc443ff9eb0af87cbc48da5c2f37e45305a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 7 Jan 2008 08:57:46 +0000 Subject: sanity.bbclass: Fix typo - everyone else must have GNU fortran already installed --- classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index fb2d058610..bbc06d9697 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -84,7 +84,7 @@ def check_sanity(e): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," if not check_app_exists('${BUILD_PREFIX}gfortran', e.data): - missing = mising + "GNU Fortran Compiler" + missing = missing + "GNU Fortran Compiler" required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" -- cgit v1.2.3