From c95d2ddbc0506a123d38d588bf0b38b04421525c Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Apr 2015 11:45:16 -0700 Subject: [PATCH 1/6] tcmode: blacklist libgcc-initial Signed-off-by: Christopher Larson --- conf/distro/include/tcmode-external-sourcery.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc index ba2ccb5..67371d0 100644 --- a/conf/distro/include/tcmode-external-sourcery.inc +++ b/conf/distro/include/tcmode-external-sourcery.inc @@ -55,6 +55,7 @@ PNBLACKLIST[gcc-cross] = "not building with an external toolchain" PNBLACKLIST[gcc-cross-initial] = "not building with an external toolchain" PNBLACKLIST[gcc-cross-intermediate] = "not building with an external toolchain" PNBLACKLIST[gcc-runtime] = "not building with an external toolchain" +PNBLACKLIST[libgcc-initial] = "not building with an external toolchain" PNBLACKLIST[libgcc] = "not building with an external toolchain" PNBLACKLIST[linux-libc-headers] = "not building with an external toolchain" PNBLACKLIST[linux-libc-headers-yocto] = "not building with an external toolchain" From 04c56641bfaeb97c4415d201c42670ac03134483 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Apr 2015 13:29:05 -0700 Subject: [PATCH 2/6] libunwind: fix build with Sourcery G++ Signed-off-by: Christopher Larson --- core/recipes-support/libunwind/libunwind_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 core/recipes-support/libunwind/libunwind_%.bbappend diff --git a/core/recipes-support/libunwind/libunwind_%.bbappend b/core/recipes-support/libunwind/libunwind_%.bbappend new file mode 100644 index 0000000..9920e7e --- /dev/null +++ b/core/recipes-support/libunwind/libunwind_%.bbappend @@ -0,0 +1,3 @@ +# For now, Sourcery G++ doesn't seem to have the gcc version which breaks the +# libunwind build, and it doesn't ship gold, we don't want to try to use it. +LDFLAGS_remove = "-fuse-ld=gold" From a0f481c1f74d4198ddd8ba14664bd40a668c98cd Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Apr 2015 13:29:25 -0700 Subject: [PATCH 3/6] glibc-external: add bash rdeps to ldd/tzcode Signed-off-by: Christopher Larson --- recipes-external/glibc/glibc-external.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-external/glibc/glibc-external.bb b/recipes-external/glibc/glibc-external.bb index e5bd709..d28d0cb 100644 --- a/recipes-external/glibc/glibc-external.bb +++ b/recipes-external/glibc/glibc-external.bb @@ -131,3 +131,7 @@ FILES_${PN}-dev += "\ ${includedir}/uchar.h \ " FILES_${PN}-dev[file-checksums] += "${libc_headers_file}" + +# Currently, ldd and tzcode from Sourcery G++ still have #!/bin/bash +RDEPENDS_ldd += "bash" +RDEPENDS_tzcode += "bash" From 21d8241639fa5e02cba7f1970d280b01577af6b6 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Apr 2015 13:29:38 -0700 Subject: [PATCH 4/6] external-toolchain.bbclass: set S=WORKDIR This avoids the build warnings due to a nonexistent ${S}. Signed-off-by: Christopher Larson --- classes/external-toolchain.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/external-toolchain.bbclass b/classes/external-toolchain.bbclass index 251096e..a45886b 100644 --- a/classes/external-toolchain.bbclass +++ b/classes/external-toolchain.bbclass @@ -14,6 +14,10 @@ # LIC_FILES_CHKSUM, so use the license from common-licenses inherit common-license +# We don't extract anything which will create S, and we don't want to see the +# warning about it +S = "${WORKDIR}" + # Prebuilt binaries, no need for any default dependencies INHIBIT_DEFAULT_DEPS = "1" From a51511d6ef2315ee758dcf5c69671ae8e163609a Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Apr 2015 13:30:02 -0700 Subject: [PATCH 5/6] external-toolchain.bbclass: skip build-deps test Missing build deps don't matter when we don't build anything. Signed-off-by: Christopher Larson --- classes/external-toolchain.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/external-toolchain.bbclass b/classes/external-toolchain.bbclass index a45886b..4434617 100644 --- a/classes/external-toolchain.bbclass +++ b/classes/external-toolchain.bbclass @@ -21,6 +21,9 @@ S = "${WORKDIR}" # Prebuilt binaries, no need for any default dependencies INHIBIT_DEFAULT_DEPS = "1" +# Missing build deps don't matter when we don't build anything +INSANE_SKIP_${PN} += "build-deps" + EXTERNAL_PN ?= "${@PN.replace('-external', '')}" PROVIDES += "${EXTERNAL_PN}" LICENSE = "CLOSED" From 3021923affd0134525036d56465740e6380600f8 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 28 Apr 2015 13:33:25 -0700 Subject: [PATCH 6/6] gdbserver-external: fix our shlibs rdepends Since external recipes don't require virtual/libc and the compilerlibs, we won't always get our rdeps on those from the shlibs processing, unless we depend on the packagedata from those recipes. Adding them to DEPENDS would have worked too, but would have been a lie in a sense, as we don't actually require those to "build", just package. Signed-off-by: Christopher Larson --- recipes-external/gdb/gdbserver-external.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes-external/gdb/gdbserver-external.bb b/recipes-external/gdb/gdbserver-external.bb index dddd5f5..e12c422 100644 --- a/recipes-external/gdb/gdbserver-external.bb +++ b/recipes-external/gdb/gdbserver-external.bb @@ -28,3 +28,9 @@ FILES_${PN} = "\ " INSANE_SKIP_${PN} += "dev-so" FILES_${PN}-doc = "${mandir}/man1/gdbserver.1" + +# Ensure that our rdeps are able to be set by shlibs processing +do_package[depends] += "\ + virtual/libc:do_packagedata \ + virtual/${TARGET_PREFIX}compilerlibs:do_packagedata \ +"