From 879ff7e931a80fd090db4485b6b6dee8e4c71d30 Mon Sep 17 00:00:00 2001 From: Petter Mabäcker Date: Mon, 12 May 2014 15:55:34 +0200 Subject: gcc: remove usage of FILESPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. Instead FILESEXTRAPATHS should be used to extend the path. Signed-off-by: Petter Mabäcker Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.8.inc | 4 ++-- meta/recipes-devtools/gcc/gcc-4.9.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc b/meta/recipes-devtools/gcc/gcc-4.8.inc index 42b4212f28..aa822cfe03 100644 --- a/meta/recipes-devtools/gcc/gcc-4.8.inc +++ b/meta/recipes-devtools/gcc/gcc-4.8.inc @@ -8,7 +8,7 @@ PV = "4.8.2" BINV = "4.8.2" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.8:" DEPENDS =+ "mpfr gmp libmpc zlib" NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" + file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://0002-uclibc-conf.patch \ diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 865ec479bb..a409430f5e 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -8,7 +8,7 @@ PV = "4.9.0" BINV = "4.9.0" -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.9' ], d)}" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-4.9:" DEPENDS =+ "mpfr gmp libmpc zlib" NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native" @@ -19,7 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" + file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \ -- cgit 1.2.3-korg