diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes-recipe/go.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oe/classextend.py | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-common.inc | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-crosssdk.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-cross-canadian.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-crosssdk.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-runtime.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust-cross-canadian.inc | 2 |
13 files changed, 17 insertions, 19 deletions
diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index 6b9748406d..b02a83a561 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass | |||
@@ -37,7 +37,7 @@ GOMIPS:mips:class-target[export] = "1" | |||
37 | 37 | ||
38 | DEPENDS_GOLANG:class-target = "virtual/${TUNE_PKGARCH}-go virtual/${TARGET_PREFIX}go-runtime" | 38 | DEPENDS_GOLANG:class-target = "virtual/${TUNE_PKGARCH}-go virtual/${TARGET_PREFIX}go-runtime" |
39 | DEPENDS_GOLANG:class-native = "go-native" | 39 | DEPENDS_GOLANG:class-native = "go-native" |
40 | DEPENDS_GOLANG:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk virtual/${TARGET_PREFIX}go-runtime" | 40 | DEPENDS_GOLANG:class-nativesdk = "virtual/${TARGET_PREFIX}go virtual/${TARGET_PREFIX}go-runtime" |
41 | 41 | ||
42 | DEPENDS:append = " ${DEPENDS_GOLANG}" | 42 | DEPENDS:append = " ${DEPENDS_GOLANG}" |
43 | 43 | ||
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 8d7e428d8a..5161d33d2d 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -32,7 +32,8 @@ class ClassExtender(object): | |||
32 | if name.endswith("-" + self.extname): | 32 | if name.endswith("-" + self.extname): |
33 | name = name.replace("-" + self.extname, "") | 33 | name = name.replace("-" + self.extname, "") |
34 | if name.startswith("virtual/"): | 34 | if name.startswith("virtual/"): |
35 | if "binutils" in name: | 35 | # Assume large numbers of dashes means a triplet is present and we don't need to convert |
36 | if name.count("-") >= 3 and name.endswith(("-go", "-binutils", "-gcc", "-g++")): | ||
36 | return name | 37 | return name |
37 | subs = name.split("/", 1)[1] | 38 | subs = name.split("/", 1)[1] |
38 | if not subs.startswith(self.extname): | 39 | if not subs.startswith(self.extname): |
@@ -152,9 +153,7 @@ class NativesdkClassExtender(ClassExtender): | |||
152 | def map_depends(self, dep): | 153 | def map_depends(self, dep): |
153 | if dep.startswith(self.extname): | 154 | if dep.startswith(self.extname): |
154 | return dep | 155 | return dep |
155 | if dep.endswith(("-gcc", "-g++")): | 156 | if dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): |
156 | return dep + "-crosssdk" | ||
157 | elif dep.endswith(("-native", "-native-runtime")) or ('nativesdk-' in dep) or ('-cross-' in dep) or ('-crosssdk-' in dep): | ||
158 | return dep | 157 | return dep |
159 | else: | 158 | else: |
160 | return self.extend_name(dep) | 159 | return self.extend_name(dep) |
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc index 12e7d77d8d..62ebb3f5bc 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc +++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc | |||
@@ -4,7 +4,7 @@ SUMMARY = "GNU binary utilities (cross-canadian for ${TARGET_ARCH} target)" | |||
4 | PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 4 | PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
5 | BPN = "binutils" | 5 | BPN = "binutils" |
6 | 6 | ||
7 | DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex" | 7 | DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex" |
8 | EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ | 8 | EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ |
9 | --enable-poison-system-directories \ | 9 | --enable-poison-system-directories \ |
10 | " | 10 | " |
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb index 4385343df6..14480785b4 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb | |||
@@ -19,7 +19,7 @@ do_configure() { | |||
19 | 19 | ||
20 | # target depends | 20 | # target depends |
21 | DEPENDS += "virtual/${TARGET_PREFIX}binutils" | 21 | DEPENDS += "virtual/${TARGET_PREFIX}binutils" |
22 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}gcc" | 22 | DEPENDS += "virtual/${TARGET_PREFIX}gcc" |
23 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs" | 23 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs" |
24 | DEPENDS += "virtual/${MLPREFIX}libc" | 24 | DEPENDS += "virtual/${MLPREFIX}libc" |
25 | 25 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index d3b36937bf..5ac82b1b57 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc | |||
@@ -11,8 +11,7 @@ CVE_PRODUCT = "gcc" | |||
11 | inherit autotools gettext texinfo | 11 | inherit autotools gettext texinfo |
12 | 12 | ||
13 | BPN = "gcc" | 13 | BPN = "gcc" |
14 | COMPILERDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}gcc:do_gcc_stash_builddir" | 14 | COMPILERDEP = "virtual/${TARGET_PREFIX}gcc:do_gcc_stash_builddir" |
15 | COMPILERDEP:class-nativesdk = "virtual/${TARGET_PREFIX}gcc-crosssdk:do_gcc_stash_builddir" | ||
16 | 15 | ||
17 | python extract_stashed_builddir () { | 16 | python extract_stashed_builddir () { |
18 | src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}") | 17 | src = d.expand("${COMPONENTS_DIR}/${BUILD_ARCH}/gcc-stashed-builddir-${TARGET_SYS}") |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index ebeee9f351..ec87b46219 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc | |||
@@ -3,7 +3,7 @@ inherit cross-canadian | |||
3 | SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" | 3 | SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" |
4 | PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 4 | PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
5 | 5 | ||
6 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc" | 6 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc" |
7 | 7 | ||
8 | GCCMULTILIB = "--enable-multilib" | 8 | GCCMULTILIB = "--enable-multilib" |
9 | 9 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc index 4e99c220a4..bd65b1fed2 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc | |||
@@ -9,4 +9,4 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" | |||
9 | GCCMULTILIB = "--disable-multilib" | 9 | GCCMULTILIB = "--disable-multilib" |
10 | 10 | ||
11 | DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}" | 11 | DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}" |
12 | PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" | 12 | PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" |
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 6bdfeae5a6..81dc572be0 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc | |||
@@ -7,7 +7,7 @@ PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" | |||
7 | BPN = "gdb" | 7 | BPN = "gdb" |
8 | 8 | ||
9 | DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp \ | 9 | DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp \ |
10 | virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc" | 10 | virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc" |
11 | 11 | ||
12 | GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" | 12 | GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" |
13 | 13 | ||
diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc index 5a80ceffa3..45758f3361 100644 --- a/meta/recipes-devtools/go/go-cross-canadian.inc +++ b/meta/recipes-devtools/go/go-cross-canadian.inc | |||
@@ -1,7 +1,7 @@ | |||
1 | inherit cross-canadian | 1 | inherit cross-canadian |
2 | 2 | ||
3 | DEPENDS = "go-native virtual/${HOST_PREFIX}go-crosssdk virtual/nativesdk-${HOST_PREFIX}go-runtime \ | 3 | DEPENDS = "go-native virtual/${HOST_PREFIX}go virtual/nativesdk-${HOST_PREFIX}go-runtime \ |
4 | virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc \ | 4 | virtual/${HOST_PREFIX}gcc virtual/nativesdk-libc \ |
5 | virtual/nativesdk-${HOST_PREFIX}compilerlibs" | 5 | virtual/nativesdk-${HOST_PREFIX}compilerlibs" |
6 | PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 6 | PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
7 | 7 | ||
diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc index 7413acb7b3..12939005c0 100644 --- a/meta/recipes-devtools/go/go-crosssdk.inc +++ b/meta/recipes-devtools/go/go-crosssdk.inc | |||
@@ -1,8 +1,8 @@ | |||
1 | inherit crosssdk | 1 | inherit crosssdk |
2 | 2 | ||
3 | DEPENDS = "go-native virtual/${TARGET_PREFIX}gcc-crosssdk virtual/nativesdk-${TARGET_PREFIX}compilerlibs virtual/${TARGET_PREFIX}binutils" | 3 | DEPENDS = "go-native virtual/${TARGET_PREFIX}gcc virtual/nativesdk-${TARGET_PREFIX}compilerlibs virtual/${TARGET_PREFIX}binutils" |
4 | PN = "go-crosssdk-${SDK_SYS}" | 4 | PN = "go-crosssdk-${SDK_SYS}" |
5 | PROVIDES = "virtual/${TARGET_PREFIX}go-crosssdk" | 5 | PROVIDES = "virtual/${TARGET_PREFIX}go" |
6 | 6 | ||
7 | export GOCACHE = "${B}/.cache" | 7 | export GOCACHE = "${B}/.cache" |
8 | 8 | ||
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index 02601f7992..3f1e795dd9 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" | 1 | DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" |
2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk" | 2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go" |
3 | PROVIDES = "virtual/${TARGET_PREFIX}go-runtime" | 3 | PROVIDES = "virtual/${TARGET_PREFIX}go-runtime" |
4 | 4 | ||
5 | DEBUG_PREFIX_MAP = "\ | 5 | DEBUG_PREFIX_MAP = "\ |
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index ed09cfe806..a4b55ad3d8 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" | 1 | DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" |
2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native" | 2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go go-native" |
3 | 3 | ||
4 | DEBUG_PREFIX_MAP = "\ | 4 | DEBUG_PREFIX_MAP = "\ |
5 | -fdebug-prefix-map=${STAGING_DIR_HOST}= \ | 5 | -fdebug-prefix-map=${STAGING_DIR_HOST}= \ |
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc index 8d0dc6a4e2..d569ac59f5 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc | |||
@@ -8,7 +8,7 @@ LICENSE = "MIT" | |||
8 | 8 | ||
9 | MODIFYTOS = "0" | 9 | MODIFYTOS = "0" |
10 | 10 | ||
11 | DEPENDS += "virtual/${SDK_PREFIX}gcc-crosssdk virtual/nativesdk-libc virtual/nativesdk-${SDK_PREFIX}compilerlibs" | 11 | DEPENDS += "virtual/${SDK_PREFIX}gcc virtual/nativesdk-libc virtual/nativesdk-${SDK_PREFIX}compilerlibs" |
12 | 12 | ||
13 | SRC_URI += "file://target-rust-ccld.c" | 13 | SRC_URI += "file://target-rust-ccld.c" |
14 | LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7" | 14 | LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7" |