tools: use pkg-config when available to get SSL flags
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sat, 16 May 2015 16:36:15 +0000 (18:36 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 28 May 2015 12:18:19 +0000 (08:18 -0400)
Instead of hardcoding -lssl -lcrypto as the flags needed to build
mkimage with FIT signature enabled, use pkg-config when
available. This allows to properly support cases where static linking
is used, which requires linking with -lz, since OpenSSL uses zlib
internally.

We gracefully fallback on the previous behavior of hardcoding -lssl
-lcrypto if pkg-config is not available or fails with an error.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
tools/Makefile

index 4bbb15336edc929640a87518c094f0eff8df220b..8ff9c2e1082335c41629aa294e8392b2075e3985 100644 (file)
@@ -122,7 +122,8 @@ endif
 
 # MXSImage needs LibSSL
 ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
-HOSTLOADLIBES_mkimage += -lssl -lcrypto
+HOSTLOADLIBES_mkimage += \
+       $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto")
 endif
 
 HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)