On Wed, 26 Feb 2025 at 14:27, Raymond Mao <[email protected]> wrote:
> HOSTCFLAGS of some tools components (image-host, rsa-sign and > ecdsa-libcrypto) depend on the directory where openssl is installed. > Add them via pkg-config. > This fixes a potential build failure in tools when openssl in installed > in varied directories. > > Signed-off-by: Raymond Mao <[email protected]> > Reviewed-by: Peter Robinson <[email protected]> > --- > tools/Makefile | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tools/Makefile b/tools/Makefile > index 237fa900a24..aafca65eb46 100644 > --- a/tools/Makefile > +++ b/tools/Makefile > @@ -75,6 +75,9 @@ FIT_OBJS-y := fit_common.o fit_image.o image-host.o > generated/boot/image-fit.o > FIT_SIG_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := image-sig-host.o > generated/boot/image-fit-sig.o > FIT_CIPHER_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := generated/boot/image-cipher.o > > +HOSTCFLAGS_image-host.o += \ > + $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo > "") > + > # The following files are synced with upstream DTC. > # Use synced versions from scripts/dtc/libfdt/. > LIBFDT_OBJS := $(addprefix libfdt/, fdt.o fdt_ro.o fdt_wip.o fdt_sw.o > fdt_rw.o \ > @@ -83,8 +86,12 @@ LIBFDT_OBJS := $(addprefix libfdt/, fdt.o fdt_ro.o > fdt_wip.o fdt_sw.o fdt_rw.o \ > RSA_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix generated/lib/rsa/, \ > rsa-sign.o rsa-verify.o \ > rsa-mod-exp.o) > +HOSTCFLAGS_rsa-sign.o += \ > + $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo > "") > > ECDSA_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix generated/lib/ecdsa/, > ecdsa-libcrypto.o) > +HOSTCFLAGS_ecdsa-libcrypto.o += \ > + $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo > "") > > AES_OBJS-$(CONFIG_TOOLS_LIBCRYPTO) := $(addprefix generated/lib/aes/, \ > aes-encrypt.o aes-decrypt.o) > -- > 2.25.1 > >
