From 3236ebeb894269511fde832799b8eb3b46b2b225 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 | 2 ++ 1 file changed, 2 insertions(+) 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 a1e59d88..ef1b7446 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 @@ -158,6 +158,8 @@ do_compile() { # These changes are needed to have the native tools compiling and executing properly 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 + # This can be removed when only TF-A 2.4 onwards is supported sed -i 's^OPENSSL_DIR.*=.*$^OPENSSL_DIR = ${STAGING_DIR_NATIVE}/${prefix_native}^' ${S}/tools/*/Makefile