1 From 99bc38ac6ebdd3b5d741cb9e50d842fa13d409f7 Mon Sep 17 00:00:00 2001
2 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3 Date: Tue, 12 May 2015 22:54:29 +0200
4 Subject: [PATCH] tools: use pkg-config when available to get SSL flags
6 Instead of hardcoding -lssl -lcrypto as the flags needed to build
7 mkimage with FIT signature enabled, use pkg-config when
8 available. This allows to properly support cases where static linking
9 is used, which requires linking with -lz, since OpenSSL uses zlib
12 We gracefully fallback on the previous behavior of hardcoding -lssl
13 -lcrypto if pkg-config is not available or fails with an error.
15 Patch submitted upstream at
16 http://lists.denx.de/pipermail/u-boot/2015-May/214489.html
18 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
20 tools/Makefile | 3 ++-
21 1 file changed, 2 insertions(+), 1 deletion(-)
23 diff --git a/tools/Makefile b/tools/Makefile
24 index 4bbb153..8ff9c2e 100644
27 @@ -122,7 +122,8 @@ endif
29 # MXSImage needs LibSSL
30 ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
31 -HOSTLOADLIBES_mkimage += -lssl -lcrypto
32 +HOSTLOADLIBES_mkimage += \
33 + $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto")
36 HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)