diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/cross-canadian.bbclass | 3 | ||||
-rw-r--r-- | meta/conf/machine/qemux86-64.conf | 1 | ||||
-rw-r--r-- | meta/recipes-core/tasks/task-cross-canadian.bb | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index f608db25d4..7971147cbe 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -68,3 +68,6 @@ export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" # Cross-canadian packages need to pull in nativesdk dynamic libs SHLIBSDIR = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${BUILD_OS}/shlibs" + +# handle x86_64 TARGET_ARCH name +TRANSLATED_TARGET_ARCH ?= ${TARGET_ARCH} diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 31459cd084..fd34709b78 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for running a common x86 TARGET_ARCH = "x86_64" +TRANSLATED_TARGET_ARCH = "x86-64" PACKAGE_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/tasks/task-cross-canadian.bb index 6a7cd2e9e6..c32afdcbd2 100644 --- a/meta/recipes-core/tasks/task-cross-canadian.bb +++ b/meta/recipes-core/tasks/task-cross-canadian.bb @@ -8,8 +8,8 @@ inherit cross-canadian PACKAGES = "${PN}" RDEPENDS_${PN} = "\ - binutils-cross-canadian-${TARGET_ARCH} \ - gdb-cross-canadian-${TARGET_ARCH} \ - gcc-cross-canadian-${TARGET_ARCH} \ + binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \ + gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \ + gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} \ " diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index 68a8e5a3a0..2fca81dbeb 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc @@ -2,7 +2,7 @@ inherit cross-canadian DESCRIPTION = "A GNU collection of cross-canadian binary utilities for ${TARGET_ARCH} target" -PN = "binutils-cross-canadian-${TARGET_ARCH}" +PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "binutils" DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk" diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index 0d39900cae..cc0a3badb9 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc @@ -1,7 +1,7 @@ inherit cross-canadian DESCRIPTION = "The cross-canadian GNU cc and gcc C compilers for ${TARGET_ARCH} target." -PN = "gcc-cross-canadian-${TARGET_ARCH}" +PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gcc" DEPENDS = "virtual/${HOST_PREFIX}binutils-crosssdk virtual/${TARGET_PREFIX}libc-for-gcc gettext-nativesdk" diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 8fe5ad8235..90a20e2868 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc @@ -1,7 +1,7 @@ inherit cross-canadian DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger" -PN = "gdb-cross-canadian-${TARGET_ARCH}" +PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb" DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk" |