From a9717cc19bb6fa9d95385ebd5fea2b3b0826cad9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 5 Aug 2014 13:29:53 +0200 Subject: bootwrapper: fix dependencies and compile flags Bootwrapper needs 'userspace' bits like libgcc and libgcc_s, which kernel.bbclass tries hard to hide. Work around this with explicit DEPENDS on libgcc and restoring *FLAGS in do_compile_append. Change-Id: Icdda8edc83b8b93c7a4796a72ce4aba4770c6721 Signed-off-by: Koen Kooi --- meta-linaro/recipes-kernel/linux/bootwrapper.inc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'meta-linaro/recipes-kernel') diff --git a/meta-linaro/recipes-kernel/linux/bootwrapper.inc b/meta-linaro/recipes-kernel/linux/bootwrapper.inc index 4b696db2..c3a56348 100644 --- a/meta-linaro/recipes-kernel/linux/bootwrapper.inc +++ b/meta-linaro/recipes-kernel/linux/bootwrapper.inc @@ -5,10 +5,25 @@ SRCREV_bootwrapper = "2ff0b45423226d3de898a52a81b8e90b20fecd60" BW = "${WORKDIR}/bootwrapper" DTBDIR="${S}/arch/arm64/boot/dts/" +# Bootwrapper needs libgcc_s.so +DEPENDS =+ "libgcc" + +export WRAPCFLAGS = "${CFLAGS}" +export WRAPCPPFLAGS = "${CPPFLAGS}" +export WRAPCXXFLAGS = "${CXXFLAGS}" +export WRAPLDFLAGS = "${LDFLAGS}" + do_compile_append() { cd ${S} oe_runmake dtbs cd ${BW} + + # Ensure the compile can find libgcc.a and other userspace friends + export CFLAGS="${WRAPCFLAGS}" + export CPPFLAGS="${WRAPCPPFLAGS}" + export CXXFLAGS="${WRAPCXXFLAGS}" + export LDFLAGS="${WRAPLDFLAGS}" + autoreconf -vfi ./configure --host=aarch64-linux-gnu \ --with-kernel-dir="${S}" \ -- cgit v1.2.3