From 66861cce918eb7ed1f16f829d652c9d7105152b7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Nov 2012 16:47:11 +0000 Subject: Revert "gcc: Use FILESPATH instead of FILESDIR and cleanup/simplify" This reverts commit 90616875b432a932415063b08497266e70c49d75. It was never meant to be applied as its an incorrect previous development verison of a patch in progress. --- meta/recipes-devtools/gcc/gcc-4.7.inc | 2 ++ meta/recipes-devtools/gcc/gcc-common.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/gcc/gcc-4.7.inc b/meta/recipes-devtools/gcc/gcc-4.7.inc index ffdffab2fd..1a3e09b071 100644 --- a/meta/recipes-devtools/gcc/gcc-4.7.inc +++ b/meta/recipes-devtools/gcc/gcc-4.7.inc @@ -18,6 +18,8 @@ PV = "4.7.2" BINV = "4.7.2" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.7' ], d)}" + DEPENDS =+ "mpfr gmp libmpc" NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index b2a258ba77..38f3b7f959 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -7,7 +7,7 @@ NATIVEDEPS = "" inherit autotools gettext -FILESPATH = "${FILE_DIRNAME}/gcc-${PV}" +FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/gcc-${PV}" def get_gcc_fpu_setting(bb, d): if d.getVar('ARMPKGSFX_EABI', True) == "hf" and d.getVar('TRANSLATED_TARGET_ARCH', True) == "arm": -- cgit v1.2.3-54-g00ecf