From 908deae315799ec2bd63179be7587ecc21d8147f Mon Sep 17 00:00:00 2001
|
From: Rolf Eike Beer <eb@emlix.com>
|
Date: Thu, 22 Nov 2018 16:40:49 +0100
|
Subject: [PATCH 7/7] BACKPORT: scripts: use pkg-config to locate libcrypto
|
|
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>
|
(cherry picked from commit 2cea4a7a1885bd0c765089afc14f7ff0eb77864e)
|
|
Change-Id: I6a96168b64f91621e7951841ecc9f3b61997c203
|
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
---
|
scripts/Makefile | 9 +++++++--
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
diff --git a/scripts/Makefile b/scripts/Makefile
|
index 0c358035d7d4..71bba476a2f1 100644
|
--- a/scripts/Makefile
|
+++ b/scripts/Makefile
|
@@ -9,6 +9,9 @@
|
# docproc: Used in Documentation/DocBook
|
# check-lc_ctype: Used in Documentation/DocBook
|
|
+CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto)
|
+CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null)
|
+
|
HOST_EXTRACFLAGS += -I$(srctree)/tools/include
|
|
hostprogs-$(CONFIG_KALLSYMS) += kallsyms
|
@@ -23,8 +26,10 @@ hostprogs-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += extract-cert
|
|
HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
|
HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
|
-HOSTLOADLIBES_sign-file = -lcrypto
|
-HOSTLOADLIBES_extract-cert = -lcrypto
|
+HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS)
|
+HOSTLOADLIBES_sign-file = $(CRYPTO_LIBS)
|
+HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
|
+HOSTLOADLIBES_extract-cert = $(CRYPTO_LIBS)
|
|
always := $(hostprogs-y) $(hostprogs-m)
|
|
--
|
2.20.1
|
