gcc-package-sdk.inc: ${layout_base_bindir} is not the path to where the real binary is.

The binary will always be two levels back, and it will always be in ${bindir}
as that's what we pass to configure, so basename that to find the right
directory name.  Bump INC_PR in gcc-canadian-sdk 4.2.4,
gcc-cross-sdk 4.2.4/4.3.3/4.4.0

diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
index 409970be5f3a4b4ddc970bf332eca68375ce0155..dadb5b04f6f098cfc3a6c282d48c048d7356700f 100644 (file)
--- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
@@ -1,6 +1,6 @@
 inherit canadian-sdk
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 

diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
index c5a0a1aa88f0a753d374b487949b9bb64d0776b9..ab52a9ae0418faff665e1b7c73b90821826d07a7 100644 (file)
--- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 inherit sdk
 

diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
index 27a7ae0a7f7754428b63eae7ae9d26007ec66215..6be2538cd5aeac25e6466246ed18d5b5f4c64534 100644 (file)
--- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 inherit sdk
 

diff --git a/recipes/gcc/gcc-package-sdk.inc b/recipes/gcc/gcc-package-sdk.inc
index 3d9cc0c53a35bec4823fce4dfe8f14a84f31942e..dcf2c890e430c2dd51d71bed50e6834848a0e09a 100644 (file)
--- a/recipes/gcc/gcc-package-sdk.inc
+++ b/recipes/gcc/gcc-package-sdk.inc
@@ -48,10 +48,9 @@ do_install () {
        # Create the ${prefix}/${TARGET_SYS}/bin/* symlinks
        install -d ${D}${prefix}/${TARGET_SYS}/bin/
        for l in ${D}${bindir}/*; do
-               echo $l
-               ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
+               ln -sf "../../`basename ${bindir}`/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`"
        done
-       ln -sf "${bindir}/${TARGET_PREFIX}gcc${EXEEXT}" "${D}${prefix}/${TARGET_SYS}/bin/cc${EXEEXT}"
+       ln -sf "../../`basename ${bindir}`/${TARGET_PREFIX}gcc${EXEEXT}" "${D}${prefix}/${TARGET_SYS}/bin/cc${EXEEXT}"
 
        # Manually run the target stripper since we won't get it run by
        # the packaging.