From baa8b031f2640a60467652625856529d9a57c6fb Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 4 Mar 2014 16:46:01 +0000 Subject: gcc-cross: don't use oe.path.relative Instead of using oe.path.relative, use the Python Standard Library function os.path.relpath. (From OE-Core rev: 90c3a0401c566e26d89a5c0410b2a51fe27b95b2) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 477f499276..8d979b1144 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -95,7 +95,7 @@ FILES_${PN}-doc = "\ EXEEXT = "" # Compute how to get from libexecdir to bindir in python (easier than shell) -BINRELPATH = "${@oe.path.relative(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${bindir}"))}" +BINRELPATH = "${@os.path.relpath(d.expand("${bindir}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}" do_install () { oe_runmake 'DESTDIR=${D}' install-host diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 5c4319fb32..777c970217 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -138,7 +138,7 @@ STOP INHIBIT_PACKAGE_STRIP = "1" # Compute how to get from libexecdir to bindir in python (easier than shell) -BINRELPATH = "${@oe.path.relative(d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"), d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"))}" +BINRELPATH = "${@os.path.relpath(d.expand("${STAGING_DIR_NATIVE}${prefix_native}/bin/${MULTIMACH_TARGET_SYS}"), d.expand("${libexecdir}/gcc/${TARGET_SYS}/${BINV}"))}" do_install () { oe_runmake 'DESTDIR=${D}' install-host -- cgit v1.2.3-54-g00ecf