diff options
10 files changed, 39 insertions, 13 deletions
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb index 2fab8f94b..8b62fab6b 100644 --- a/meta/recipes-core/meta/meta-toolchain.bb +++ b/meta/recipes-core/meta/meta-toolchain.bb @@ -13,7 +13,7 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${TARGET_SYS}" IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDKTARGETSYSROOT}" -TOOLCHAIN_HOST_TASK ?= "task-sdk-host" +TOOLCHAIN_HOST_TASK ?= "task-sdk-host task-cross-canadian" TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target task-poky-standalone-sdk-target-dbg" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/tasks/task-cross-canadian.bb new file mode 100644 index 000000000..6a7cd2e9e --- /dev/null +++ b/meta/recipes-core/tasks/task-cross-canadian.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Host SDK package for cross canadian toolchain" +PR = "r0" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +inherit cross-canadian + +PACKAGES = "${PN}" + +RDEPENDS_${PN} = "\ + binutils-cross-canadian-${TARGET_ARCH} \ + gdb-cross-canadian-${TARGET_ARCH} \ + gcc-cross-canadian-${TARGET_ARCH} \ + " + diff --git a/meta/recipes-core/tasks/task-sdk-host.bb b/meta/recipes-core/tasks/task-sdk-host.bb index bccf48dbd..7bf445386 100644 --- a/meta/recipes-core/tasks/task-sdk-host.bb +++ b/meta/recipes-core/tasks/task-sdk-host.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "Host packages for the standalone SDK or external toolchain" -PR = "r8" +PR = "r9" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -12,9 +12,6 @@ inherit nativesdk PACKAGES = "${PN}" RDEPENDS_${PN} = "\ - binutils-cross-canadian \ - gdb-cross-canadian \ - gcc-cross-canadian \ pkgconfig-nativesdk \ qemu-nativesdk \ qemu-helper-nativesdk \ diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index 4953bc2c3..68a8e5a3a 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc @@ -1,4 +1,10 @@ inherit cross-canadian + + +DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target" +PN = "binutils-cross-canadian-${TARGET_ARCH}" +BPN = "binutils" + DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk" EXTRA_OECONF = "--with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \ --program-prefix=${TARGET_PREFIX}" diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb index 631be4fe7..1621b77e9 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian_2.20.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-canadian.inc -PR = "r5" +PR = "r6" diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index a3b15c3dc..0d39900ca 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -1,4 +1,8 @@ inherit cross-canadian +DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} target." +PN = "gcc-cross-canadian-${TARGET_ARCH}" +BPN = "gcc" + DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk" diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb index 43bab3961..d420f80f2 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.3.3.bb @@ -5,7 +5,7 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r19" +PR = "r20" DEPENDS += "gmp-nativesdk mpfr-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk" diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb index e160aab8a..98e239d92 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.5.1.bb @@ -5,7 +5,7 @@ require gcc-cross-canadian.inc require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r0" +PR = "r1" DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc new file mode 100644 index 000000000..8fe5ad823 --- /dev/null +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -0,0 +1,7 @@ +inherit cross-canadian + +DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger" +PN = "gdb-cross-canadian-${TARGET_ARCH}" +BPN = "gdb" + +DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb index 5982c0568..ca44b3c4f 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.2.bb @@ -1,10 +1,7 @@ require gdb-common.inc +require gdb-cross-canadian.inc -DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" - -inherit cross-canadian - -PR = "r0" +PR = "r1" GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" EXPAT = "--with-expat" |