summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/conf/layer.conf1
-rw-r--r--meta/recipes-core/glibc/glibc.inc2
-rw-r--r--meta/recipes-core/musl/musl_git.bb2
-rw-r--r--meta/recipes-core/newlib/newlib_3.0.0.bb2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross.inc1
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/go/go-cross-canadian.inc2
9 files changed, 6 insertions, 10 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index a586c63d4b..c9fed48bce 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -16,8 +16,6 @@ PREFERRED_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
19PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
20PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc ?= "nativesdk-glibc"
21PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" 19PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
22PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial" 20PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial"
23PREFERRED_PROVIDER_virtual/gettext ??= "gettext" 21PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index c67dec49ed..7afccdf335 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -51,7 +51,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
51 *->git-native \ 51 *->git-native \
52 *->ccache-native \ 52 *->ccache-native \
53 *->icecc-create-env-native \ 53 *->icecc-create-env-native \
54 gcc-cross-${TARGET_ARCH}->virtual/${TARGET_PREFIX}libc-for-gcc \
55 gcc-cross-${TARGET_ARCH}->linux-libc-headers \ 54 gcc-cross-${TARGET_ARCH}->linux-libc-headers \
56 ppp-dialin->ppp \ 55 ppp-dialin->ppp \
57 resolvconf->bash \ 56 resolvconf->bash \
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index de692fbfd7..6aee89bb53 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -17,7 +17,7 @@ python () {
17 17
18DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers" 18DEPENDS = "virtual/${TARGET_PREFIX}gcc libgcc-initial linux-libc-headers"
19 19
20PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" 20PROVIDES = "virtual/libc"
21PROVIDES += "virtual/libintl virtual/libiconv" 21PROVIDES += "virtual/libintl virtual/libiconv"
22inherit autotools texinfo distro_features_check systemd 22inherit autotools texinfo distro_features_check systemd
23 23
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 9cc875c4a6..3dc56cef85 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -17,7 +17,7 @@ SRC_URI = "git://git.musl-libc.org/musl \
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
19 19
20PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc virtual/libiconv virtual/libintl virtual/crypt" 20PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt"
21 21
22DEPENDS = "virtual/${TARGET_PREFIX}binutils \ 22DEPENDS = "virtual/${TARGET_PREFIX}binutils \
23 virtual/${TARGET_PREFIX}gcc-initial \ 23 virtual/${TARGET_PREFIX}gcc-initial \
diff --git a/meta/recipes-core/newlib/newlib_3.0.0.bb b/meta/recipes-core/newlib/newlib_3.0.0.bb
index 09238fe006..db13724eb5 100644
--- a/meta/recipes-core/newlib/newlib_3.0.0.bb
+++ b/meta/recipes-core/newlib/newlib_3.0.0.bb
@@ -1,6 +1,6 @@
1require newlib.inc 1require newlib.inc
2 2
3PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc virtual/libiconv virtual/libintl" 3PROVIDES += "virtual/libc virtual/libiconv virtual/libintl"
4 4
5do_configure() { 5do_configure() {
6 ${S}/configure ${EXTRA_OECONF} 6 ${S}/configure ${EXTRA_OECONF}
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 73f1e05446..e7c08d3a61 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
3SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" 3SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)"
4PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" 4PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}"
5 5
6DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc nativesdk-gettext flex-native virtual/libc" 6DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc"
7 7
8GCCMULTILIB = "--enable-multilib" 8GCCMULTILIB = "--enable-multilib"
9 9
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index add6b43017..6222c2e8c9 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -31,7 +31,6 @@ EXTRA_OECONF += "\
31 --with-system-zlib \ 31 --with-system-zlib \
32" 32"
33 33
34DEPENDS_remove_libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc"
35EXTRA_OECONF_append_libc-baremetal = " --without-headers" 34EXTRA_OECONF_append_libc-baremetal = " --without-headers"
36EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" 35EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix"
37EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix" 36EXTRA_OECONF_remove_libc-newlib = "--enable-threads=posix"
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index 4fc6747d9d..475e4f08ef 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -6,7 +6,7 @@ PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
6BPN = "gdb" 6BPN = "gdb"
7 7
8DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \ 8DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext \
9 virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc" 9 virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc"
10 10
11GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" 11GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
12 12
diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc
index ea68b8875d..0bc5dce8a1 100644
--- a/meta/recipes-devtools/go/go-cross-canadian.inc
+++ b/meta/recipes-devtools/go/go-cross-canadian.inc
@@ -1,7 +1,7 @@
1inherit cross-canadian 1inherit cross-canadian
2 2
3DEPENDS = "go-native virtual/${HOST_PREFIX}go-crosssdk virtual/nativesdk-${HOST_PREFIX}go-runtime \ 3DEPENDS = "go-native virtual/${HOST_PREFIX}go-crosssdk virtual/nativesdk-${HOST_PREFIX}go-runtime \
4 virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-${HOST_PREFIX}libc-for-gcc \ 4 virtual/${HOST_PREFIX}gcc-crosssdk virtual/nativesdk-libc \
5 virtual/nativesdk-${HOST_PREFIX}compilerlibs" 5 virtual/nativesdk-${HOST_PREFIX}compilerlibs"
6PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" 6PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}"
7 7