angstrom-next: Adapt to latest toolchain changes from OE-Core

Also perform some cleanup when at it.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2014-05-08 19:34:56 -07:00
parent 3f6626c055
commit 421f88738b
4 changed files with 12 additions and 41 deletions

View File

@@ -59,33 +59,24 @@ PREFERRED_VERSION_nativesdk-linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSIO
#Everybody else can just use this:
ANGSTROM_GCC_VERSION ?= "4.9%"
ANGSTROM_NATIVE_GCC_VERSION ?= "4.9%"
ANGSTROM_BINUTILS_VERSION ?= "2.24%"
ANGSTROM_NATIVE_BINUTILS_VERSION ?= "2.24%"
ANGSTROM_GDB_VERSION ?= "7.7%"
ANGSTROM_NATIVE_BINUTILS_VERSION ?= "2.24%"
#use Linaro tools for ARM
ANGSTROM_GCC_VERSION_arm ?= "linaro-4.8%"
# we use OE-Core for native and nativesdk GCC
SDKGCCVERSION_arm ?= "4.9%"
ANGSTROM_BINUTILS_VERSION_arm ?= "linaro-2.24%"
ANGSTROM_GDB_VERSION_arm ?= "linaro-7.6%"
PREFERRED_VERSION_eglibc_arm ?= "linaro-2.19%"
ANGSTROM_QEMU_VERSION ?= "1.7.0"
PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}"
PREFERRED_VERSION_binutils-crosssdk ?= "${ANGSTROM_BINUTILS_VERSION}"
PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${ANGSTROM_BINUTILS_VERSION}"
GCCVERSION = "${ANGSTROM_GCC_VERSION}"
BINUVERSION = "${ANGSTROM_BINUTILS_VERSION}"
PREFERRED_VERSION_binutils-native ?= "${ANGSTROM_NATIVE_BINUTILS_VERSION}"
PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross-canadian ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-crosssdk ?= "${ANGSTROM_NATIVE_GCC_VERSION}"
PREFERRED_VERSION_gcc-crosssdk-initial ?= "${ANGSTROM_NATIVE_GCC_VERSION}"
PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${ANGSTROM_NATIVE_GCC_VERSION}"
PREFERRED_VERSION_gcc-runtime ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_libgcc ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_libgcc-initial ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_nativesdk-libgcc ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_nativesdk-binutils ?= "${ANGSTROM_NATIVE_BINUTILS_VERSION}"
PREFERRED_VERSION_cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${ANGSTROM_NATIVE_BINUTILS_VERSION}"
PREFERRED_VERSION_gdb ?= "${ANGSTROM_GDB_VERSION}"
PREFERRED_VERSION_gdb-cross ?= "${ANGSTROM_GDB_VERSION}"

View File

@@ -1,6 +1,5 @@
# uclibc:
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross-${TARGET_ARCH}"
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
# The things uclibc can provide. We default to wanting uclibc to provide them.

View File

@@ -37,15 +37,7 @@ SRC_DIST_LOCAL ?= "symlink"
TCLIBC ?= "eglibc"
# The things *libc can provide.
PREFERRED_PROVIDER_virtual/libc = "${TCLIBC}"
PREFERRED_PROVIDER_eglibc = "eglibc"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
# And the same as above for the nativesdk
PREFERRED_PROVIDER_virtual/libc-nativesdk = "${TCLIBC}-nativesdk"
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk"
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "${TCLIBC}-nativesdk"
PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk"

View File

@@ -1,12 +1 @@
# Toolchain specific virtuals
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross-${TARGET_ARCH}"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils-crosssdk = "binutils-crosssdk-${TARGET_ARCH}"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial-${TARGET_ARCH}"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross-${TARGET_ARCH}"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_libgcc ?= "libgcc"
PREFERRED_PROVIDER_libgcc-inital ?= "libgcc-initial"
PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"