[OE-core] [PATCH 2/3] gcc-cross: don't use oe.path.relative
Ross Burton
ross.burton at intel.com
Tue Mar 4 16:46:01 UTC 2014
Instead of using oe.path.relative, use the Python Standard Library function
os.path.relpath.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +-
meta/recipes-devtools/gcc/gcc-cross.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 477f499..8d979b1 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 5c4319f..777c970 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
--
1.7.10.4
More information about the Openembedded-core
mailing list