summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-01-18 16:17:58 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-21 11:18:37 +0000
commitbc9d2fbfd4eaad0df5647dd5d07dfb9fcff80ff3 (patch)
tree932aff7c30893ed2625143e53a968521c8ebf8d7 /meta/recipes-devtools
parentb1025bd5385de70ba1e1fc8ec9d2fb59d7fe1e91 (diff)
downloadpoky-bc9d2fbfd4eaad0df5647dd5d07dfb9fcff80ff3.tar.gz
staging: Use relative path in sysroot-destdir for target recipes
Original we used absolute path in sysroot-destdir for both native and target recipes. This commit changes target recipes to use relative path which is same as the image directory. [sgw: merged with libtool sysroot work] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc3
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.4.bb4
-rw-r--r--meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb4
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.4.bb6
4 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 72a42411b1..48c6d9aabe 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -17,6 +17,9 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
17 ${EXTRA_OECONF_INTERMEDIATE} \ 17 ${EXTRA_OECONF_INTERMEDIATE} \
18 ${@get_gcc_fpu_setting(bb, d)}" 18 ${@get_gcc_fpu_setting(bb, d)}"
19 19
20do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
21do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TARGET}/${target_base_libdir}"
22
20do_compile () { 23do_compile () {
21 oe_runmake 24 oe_runmake
22} 25}
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
index cd2bcecaf9..e3b40f2560 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
@@ -26,6 +26,6 @@ do_install () {
26SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" 26SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
27 27
28libtoolcross_sysroot_preprocess () { 28libtoolcross_sysroot_preprocess () {
29 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ 29 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
30 install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool 30 install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool
31} 31}
diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
index 2c01a4eb8e..45c9af66c6 100644
--- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
@@ -21,6 +21,6 @@ do_install () {
21SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" 21SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess"
22 22
23libtoolnativesdk_sysroot_preprocess () { 23libtoolnativesdk_sysroot_preprocess () {
24 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ 24 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
25 install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool 25 install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool
26} 26}
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.bb
index ee24444a81..a820bed0dd 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.bb
@@ -8,8 +8,8 @@ PR = "r1"
8SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess" 8SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess"
9 9
10libtool_sysroot_preprocess () { 10libtool_sysroot_preprocess () {
11 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${bindir}/* 11 rm -rf ${SYSROOT_DESTDIR}${bindir}/*
12 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/aclocal/* 12 rm -rf ${SYSROOT_DESTDIR}${datadir}/aclocal/*
13 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/libtool/config/* 13 rm -rf ${SYSROOT_DESTDIR}${datadir}/libtool/config/*
14} 14}
15 15