| From 2cea4a7a1885bd0c765089afc14f7ff0eb77864e Mon Sep 17 00:00:00 2001 |
| From: Rolf Eike Beer <eb@emlix.com> |
| Date: Thu, 22 Nov 2018 16:40:49 +0100 |
| Subject: scripts: use pkg-config to locate libcrypto |
| |
| From: Rolf Eike Beer <eb@emlix.com> |
| |
| 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: Rolf Eike Beer <eb@emlix.com> |
| Cc: stable@vger.kernel.org # 5.6.x |
| Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| scripts/Makefile | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| diff --git a/scripts/Makefile b/scripts/Makefile |
| index b5418ec587fb..9de3c03b94aa 100644 |
| --- a/scripts/Makefile |
| +++ b/scripts/Makefile |
| @@ -3,6 +3,9 @@ |
| # scripts contains sources for various helper programs used throughout |
| # the kernel for the build process. |
| |
| +CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto) |
| +CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null) |
| + |
| hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c |
| hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms |
| hostprogs-always-$(BUILD_C_RECORDMCOUNT) += recordmcount |
| @@ -14,8 +17,9 @@ hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert |
| |
| HOSTCFLAGS_sorttable.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) |
| |
| ifdef CONFIG_UNWINDER_ORC |
| ifeq ($(ARCH),x86_64) |
| -- |
| 2.30.0 |
| |
