diff mbox series

[4.9,10/41] scripts: use pkg-config to locate libcrypto

Message ID	20210305120851.788098177@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rolf Eike Beer <eb@emlix.com>, Masahiro Yamada <masahiroy@kernel.org> Subject: [PATCH 4.9 10/41] scripts: use pkg-config to locate libcrypto Date: Fri, 5 Mar 2021 13:22:17 +0100 Message-Id: <20210305120851.788098177@linuxfoundation.org> In-Reply-To: <20210305120851.255002428@linuxfoundation.org> References: <20210305120851.255002428@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,02/41] futex: Cleanup refcounting [4.9,03/41] futex: Pull rt_mutex_futex_unlock() out from under hb->lock [4.9,04/41] futex: Futex_unlock_pi() determinism [4.9,05/41] futex: Fix pi_state->owner serialization [4.9,06/41] futex: Fix more put_pi_state() vs. exit_pi_state_list() races [4.9,07/41] futex: Dont enable IRQs unconditionally in put_pi_state() [4.9,08/41] net: usb: qmi_wwan: support ZTE P685M modem [4.9,09/41] arm: kprobes: Allow to handle reentered kprobe on single-stepping [4.9,10/41] scripts: use pkg-config to locate libcrypto [4.9,11/41] scripts: set proper OpenSSL include dir also for sign-file [4.9,12/41] hugetlb: fix update_and_free_page contig page struct assumption [4.9,13/41] printk: fix deadlock when kernel panic [4.9,14/41] arm64: Remove redundant mov from LL/SC cmpxchg [4.9,15/41] arm64: Avoid redundant type conversions in xchg() and cmpxchg() [4.9,16/41] arm64: cmpxchg: Use "K" instead of "L" for ll/sc immediate constraint [4.9,17/41] arm64: Use correct ll/sc atomic constraints [4.9,18/41] JFS: more checks for invalid superblock [4.9,19/41] xfs: Fix assert failure in xfs_setattr_size() [4.9,20/41] smackfs: restrict bytes count in smackfs write functions [4.9,21/41] net: fix up truesize of cloned skb in skb_prepare_for_shift() [4.9,22/41] mm/hugetlb.c: fix unnecessary address expansion of pmd sharing [4.9,23/41] staging: fwserial: Fix error handling in fwserial_create [4.9,24/41] x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk [4.9,25/41] vt/consolemap: do font sum unsigned [4.9,26/41] wlcore: Fix command execute failure 19 for wl12xx [4.9,27/41] pktgen: fix misuse of BUG_ON() in pktgen_thread_worker() [4.9,28/41] ath10k: fix wmi mgmt tx queue full due to race condition [4.9,29/41] x86/build: Treat R_386_PLT32 relocation as R_386_PC32 [4.9,30/41] Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data [4.9,31/41] staging: most: sound: add sanity check for function argument [4.9,32/41] media: uvcvideo: Allow entities with no pads [4.9,33/41] scsi: iscsi: Restrict sessions and handles to admin capabilities [4.9,34/41] sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output [4.9,35/41] scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE [4.9,36/41] scsi: iscsi: Verify lengths on passthrough PDUs [4.9,37/41] Xen/gnttab: handle p2m update errors on a per-slot basis [4.9,38/41] xen-netback: respect gnttab_map_refs()s return value [4.9,39/41] zsmalloc: account the number of compacted pages correctly [4.9,40/41] swap: fix swapfile read/write offset [4.9,41/41] media: v4l: ioctl: Fix memory leak in video_usercopy

Commit Message

Greg Kroah-Hartman March 5, 2021, 12:22 p.m. UTC

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>
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 mbox series

Patch

--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -11,6 +11,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_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
@@ -23,8 +26,9 @@  hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFIC
 
 HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
-HOSTLOADLIBES_sign-file = -lcrypto
-HOSTLOADLIBES_extract-cert = -lcrypto
+HOSTLOADLIBES_sign-file = $(CRYPTO_LIBS)
+HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
+HOSTLOADLIBES_extract-cert = $(CRYPTO_LIBS)
 
 always		:= $(hostprogs-y) $(hostprogs-m)