gcc-cross-intermediate, gcc-crosssdk-intermediate: change CROSS_TARGET_SYS_DIR and...

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 48c6d9aabed2940ba508fcb1746d345d3350c8af..12fdb70ae8dbd4674abd3429922ba35dfd829859 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -3,6 +3,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
 PACKAGES = ""
 
+CROSS_TARGET_SYS_DIR_append = ".${PN}"
+
 # This is intended to be a -very- basic config
 # sysroot is needed in case we use libc-initial
 EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
@@ -28,4 +30,18 @@ do_install () {
        oe_runmake 'DESTDIR=${D}' install
        install -d ${D}${target_base_libdir}/
        mv ${D}${exec_prefix}/${TARGET_SYS}/lib/* ${D}${target_base_libdir}/
+
+       # We don't really need this (here shares/ contains man/, info/, locale/).
+       rm -rf ${D}${datadir}/
+
+       # We use libiberty from binutils
+       rm -f ${D}${exec_prefix}/lib/lib/libiberty.a
+
+       # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
+       # found. These need to be relative paths so they work in different locations.
+       dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
+       install -d $dest
+       for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
+               ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+       done
 }

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb
index 9a30cb51195a5376bff61bc8390e0978aaa36b3c..a8473b0ebe7b7b3ea493f632ae1a4f0876095631 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.3.3.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-PR = "r4"
+PR = "r5"
 

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
index 10681dad4b5d0961405ef999dd3f73b9b3c52d11..e65d5df671789da6dd819783b32ac602bba79996 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.5.1.bb
@@ -1,4 +1,4 @@
 require gcc-cross_${PV}.bb
 require gcc-cross-intermediate.inc
-PR = "r2"
+PR = "r3"