From 8527e69355df7d107ebaf05bcb6c0c9decf5816e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 8 Nov 2021 12:33:36 +0000 Subject: [PATCH] arm/trusted-firmware-a: ensure native cert_create has -rpath Patch in BUILD_LDFLAGS into the cert_create Makefile so that the -rpath arguments are passed to the native build, meaning it can find libssl correctly. This somewhat worked previously as the host libssl and sysroot libssl matched, but now that OE has OpenSSL 3 that often isn't the case. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 39b51566..243e641c 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -152,10 +152,11 @@ BUILD_DIR .= "${@'/${TFA_BOARD}' if d.getVar('TFA_BOARD') else ''}" BUILD_DIR .= "/${@'debug' if d.getVar("TFA_DEBUG") == '1' else 'release'}" do_compile() { - # This is still needed to have the native fiptool executing properly by + # This is still needed to have the native tools executing properly by # setting the RPATH sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile + sed -i '/^LIB/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/cert_create/Makefile # Currently there are races if you build all the targets at once in parallel for T in ${TFA_BUILD_TARGET}; do