summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/conf/distro/include/tcmode-default.inc12
-rw-r--r--meta/recipes-core/glibc/glibc-initial.inc2
-rw-r--r--meta/recipes-core/glibc/glibc.inc2
-rw-r--r--meta/recipes-core/musl/musl.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-crosssdk.inc2
-rw-r--r--meta/recipes-devtools/gcc/libgcc-initial.inc2
11 files changed, 16 insertions, 16 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index ea0710fe72..21957d84a1 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -485,7 +485,7 @@ python () {
485 485
486 check_license = False if pn.startswith("nativesdk-") else True 486 check_license = False if pn.startswith("nativesdk-") else True
487 for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}", 487 for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}",
488 "-crosssdk-${SDK_ARCH}", "-crosssdk-initial-${SDK_ARCH}", 488 "-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}",
489 "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]: 489 "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
490 if pn.endswith(d.expand(t)): 490 if pn.endswith(d.expand(t)):
491 check_license = False 491 check_license = False
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 7985596328..ca3c5ec90a 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -9,10 +9,10 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}"
9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" 9PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
10PREFERRED_PROVIDER_gdb = "gdb" 10PREFERRED_PROVIDER_gdb = "gdb"
11 11
12PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_ARCH}" 12PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_SYS}"
13PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc-initial = "gcc-crosssdk-initial-${SDK_ARCH}" 13PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc-initial = "gcc-crosssdk-initial-${SDK_SYS}"
14PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_ARCH}" 14PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}"
15PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_ARCH}" 15PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}"
16PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" 16PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime"
17 17
18# Default libc config 18# Default libc config
@@ -33,8 +33,8 @@ LINUXLIBCVERSION ?= "4.8%"
33PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 33PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
34PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" 34PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
35PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}" 35PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}"
36PREFERRED_VERSION_gcc-crosssdk-${SDK_ARCH} ?= "${SDKGCCVERSION}" 36PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}"
37PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}" 37PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_SYS} ?= "${SDKGCCVERSION}"
38PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" 38PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}"
39PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" 39PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}"
40PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" 40PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}"
diff --git a/meta/recipes-core/glibc/glibc-initial.inc b/meta/recipes-core/glibc/glibc-initial.inc
index ec21f105d0..2e3bc8104a 100644
--- a/meta/recipes-core/glibc/glibc-initial.inc
+++ b/meta/recipes-core/glibc/glibc-initial.inc
@@ -5,7 +5,7 @@ PACKAGES = ""
5PACKAGES_DYNAMIC = "" 5PACKAGES_DYNAMIC = ""
6 6
7STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" 7STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
8STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" 8STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
9TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" 9TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
10 10
11do_configure () { 11do_configure () {
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index bf1dccdeb8..e85c7044a0 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -3,7 +3,7 @@ require glibc-ld.inc
3require glibc-testing.inc 3require glibc-testing.inc
4 4
5STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" 5STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
6STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" 6STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
7PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" 7PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
8 8
9TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}" 9TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
diff --git a/meta/recipes-core/musl/musl.inc b/meta/recipes-core/musl/musl.inc
index 276b00fdc4..7ed931c6da 100644
--- a/meta/recipes-core/musl/musl.inc
+++ b/meta/recipes-core/musl/musl.inc
@@ -17,7 +17,7 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
17INHIBIT_DEFAULT_DEPS = "1" 17INHIBIT_DEFAULT_DEPS = "1"
18 18
19STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" 19STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
20STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" 20STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
21 21
22 22
23FILES_SOLIBSDEV = "" 23FILES_SOLIBSDEV = ""
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
index 788106f9e7..62c03d7240 100644
--- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
+++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.27.bb
@@ -2,7 +2,7 @@ require binutils-cross_${PV}.bb
2 2
3inherit crosssdk 3inherit crosssdk
4 4
5PN = "binutils-crosssdk-${TARGET_ARCH}" 5PN = "binutils-crosssdk-${SDK_SYS}"
6 6
7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" 7PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
8 8
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 048b5302be..dcf22710ae 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -77,7 +77,7 @@ do_install () {
77 77
78 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build 78 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
79 case ${PN} in 79 case ${PN} in
80 *gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${TARGET_ARCH}) 80 *gcc-cross-initial-${TARGET_ARCH}|*gcc-crosssdk-initial-${SDK_SYS})
81 dest=${D}/${includedir}/gcc-build-internal-initial-${TARGET_SYS} 81 dest=${D}/${includedir}/gcc-build-internal-initial-${TARGET_SYS}
82 hardlinkdir . $dest 82 hardlinkdir . $dest
83 ;; 83 ;;
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index c0b8751ede..87a8de9a85 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -188,7 +188,7 @@ do_install () {
188 188
189 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build 189 # gcc-runtime installs libgcc into a special location in staging since it breaks doing a standalone build
190 case ${PN} in 190 case ${PN} in
191 *gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${TARGET_ARCH}) 191 *gcc-cross-${TARGET_ARCH}|*gcc-crosssdk-${SDK_SYS})
192 dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS} 192 dest=${D}/${includedir}/gcc-build-internal-${TARGET_SYS}
193 hardlinkdir . $dest 193 hardlinkdir . $dest
194 ;; 194 ;;
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
index 7d2599cb6c..08eda5d4c7 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk-initial.inc
@@ -1,6 +1,6 @@
1inherit crosssdk 1inherit crosssdk
2 2
3PN = "gcc-crosssdk-initial-${TARGET_ARCH}" 3PN = "gcc-crosssdk-initial-${SDK_SYS}"
4 4
5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" 6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
index 53f880f39b..cda2927794 100644
--- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc
+++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc
@@ -1,6 +1,6 @@
1inherit crosssdk 1inherit crosssdk
2 2
3PN = "gcc-crosssdk-${TARGET_ARCH}" 3PN = "gcc-crosssdk-${SDK_SYS}"
4 4
5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include" 5SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/" 6SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
diff --git a/meta/recipes-devtools/gcc/libgcc-initial.inc b/meta/recipes-devtools/gcc/libgcc-initial.inc
index 59e8a62e7f..687a8a0b09 100644
--- a/meta/recipes-devtools/gcc/libgcc-initial.inc
+++ b/meta/recipes-devtools/gcc/libgcc-initial.inc
@@ -5,7 +5,7 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
5LICENSE = "GPL-3.0-with-GCC-exception" 5LICENSE = "GPL-3.0-with-GCC-exception"
6 6
7STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}" 7STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
8STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}" 8STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${SDK_SYS}"
9PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:" 9PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
10 10
11PACKAGES = "" 11PACKAGES = ""