canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils

Without this gdb-canadian-sdk would try and build without a host compiler as
it wasn't fixing up this missing dep itself. The comment in the bbclass was
wrong (checked -g on all recipes using this bbclass).

diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass
index 6b4fdf878ab45c22ba35045c2ef20789a12bbc7b..a6c555231058e53d2982d0a8fd4190afe9851eca 100644 (file)
--- a/classes/canadian-sdk.bbclass
+++ b/classes/canadian-sdk.bbclass
@@ -19,11 +19,7 @@ CFLAGS = "${SDK_CFLAGS}"
 CXXFLAGS = "${SDK_CFLAGS}"
 LDFLAGS = "${SDK_LDFLAGS}"
 
-# TODO: add logic to add the following unless PN ~= gcc*
-#DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc "
-# and otherwise just
-DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils "
-
+DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc "
 
 # On mingw systems we want to have the real sysroot default to c:/... and
 # assume that the default install will be on the C drive.  This can be changed

diff --git a/recipes/binutils/binutils-canadian-sdk_2.18.bb b/recipes/binutils/binutils-canadian-sdk_2.18.bb
index e44e7b7144f2497dd9558eac4c0a123075b93556..96726f82a8e368e08c398eff7e2bcfcdd635f63b 100644 (file)
--- a/recipes/binutils/binutils-canadian-sdk_2.18.bb
+++ b/recipes/binutils/binutils-canadian-sdk_2.18.bb
@@ -2,11 +2,7 @@ SECTION = "devel"
 require binutils_${PV}.bb
 inherit canadian-sdk
 
-DEPENDS="\
-       virtual/${HOST_PREFIX}binutils \
-       virtual/${HOST_PREFIX}gcc \
-       flex-native bison-native \
-"
+DEPENDS = "flex-native bison-native"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
 # On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW}

diff --git a/recipes/make/mingw-make-canadian-sdk_3.81.bb b/recipes/make/mingw-make-canadian-sdk_3.81.bb
index 3479dad24975069a3f50c2f9a8938d39a741ffef..a4b1f729ce79f1285de5e8ac785899e98468743f 100644 (file)
--- a/recipes/make/mingw-make-canadian-sdk_3.81.bb
+++ b/recipes/make/mingw-make-canadian-sdk_3.81.bb
@@ -9,8 +9,6 @@ interdependent files, and, if necessary, issues commands \
 to bring them up-to-date - MinGW port."
 HOMEPAGE = "http://www.mingw.org/"
 
-DEPENDS = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/mingw/mingw32-make-3.81-20080326-src.tar.gz"
 
 S = "${WORKDIR}/make-${PV}-patched"