Message ID | 2278760.8Yd83Mgoko@devpool35 (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | [v4] scripts: use pkg-config to locate libcrypto | expand |
Am Montag, 27. April 2020, 10:11:28 CEST schrieb Rolf Eike Beer: > From 082ba542ca4c710dcf592a6f9233603b9275d05d 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 1/2] 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. Close to 2 years since the original patch… can this please be applied? It get's annoying to patch every new kernel version the same way again. Thx Eike
diff --git a/scripts/Makefile b/scripts/Makefile index 95ecf970c74c..35ed997e074b 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -3,6 +3,11 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. +PKG_CONFIG?= pkg-config + +CRYPTO_LIBS = $(shell $(PKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto) +CRYPTO_CFLAGS = $(shell $(PKG_CONFIG) --cflags libcrypto 2> /dev/null) + always-$(CONFIG_BUILD_BIN2C) += bin2c always-$(CONFIG_KALLSYMS) += kallsyms always-$(BUILD_C_RECORDMCOUNT) += recordmcount @@ -14,8 +19,9 @@ 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)