Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7961457 authored by Rolf Eike Beer's avatar Rolf Eike Beer Committed by Greg Kroah-Hartman
Browse files

scripts: use pkg-config to locate libcrypto 



commit 2cea4a7a1885bd0c765089afc14f7ff0eb77864e upstream.

Otherwise build fails if the headers are not in the default location. While at
it also ask pkg-config for the libs, with fallback to the existing value.

Signed-off-by: default avatarRolf Eike Beer <eb@emlix.com>
Cc: stable@vger.kernel.org # 5.6.x
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94c28da4

scripts/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 


HOST_EXTRACFLAGS += -I$(srctree)/tools/include



CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto)

CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null)



hostprogs-$(CONFIG_BUILD_BIN2C)  += bin2c

hostprogs-$(CONFIG_KALLSYMS)     += kallsyms

hostprogs-$(CONFIG_LOGO)         += pnmtologo
@@ -23,8 +26,9 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert 


HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include

HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include

HOSTLDLIBS_sign-file = -lcrypto

HOSTLDLIBS_extract-cert = -lcrypto

HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)

HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)

HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)



always		:= $(hostprogs-y) $(hostprogs-m)