From cbcab61c655a173810b06ebff737eef02802724e Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Mon, 11 Jul 2022 11:55:30 +0200 Subject: [PATCH] libpv: fix dependency checking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a bug that make still tried to build libpv even when the compilation of libpv was turned off. This lead to a build bug when one of the dependencies was not met. Also fixes the check of the OpenSSL version at build time.i Fixes: 38639269 ("libpv: New library for PV tools") Signed-off-by: Steffen Eiden Reviewed-by: Marc Hartmayer Signed-off-by: Jan Höppner --- libpv/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libpv/Makefile b/libpv/Makefile index c76e6ceb..d9a1cffb 100644 --- a/libpv/Makefile +++ b/libpv/Makefile @@ -51,7 +51,7 @@ endif sources := $(wildcard *.c) objects := $(patsubst %.c,%.o,$(sources)) -all: $(BUILD_TARGETS) .check_dep-$(LIB) +all: $(BUILD_TARGETS) $(LIB): $(objects) $(LIB): ALL_CFLAGS += -fPIC @@ -74,7 +74,7 @@ skip-$(LIB): .detect-openssl.dep.c: echo "#include " > $@ echo "#if OPENSSL_VERSION_NUMBER < 0x10101000L" >> $@ - echo " #error openssl version 1.1.0 is required" >> $@ + echo " #error openssl version 1.1.1 is required" >> $@ echo "#endif" >> $@ echo "static void __attribute__((unused)) test(void) {" >> $@ echo " EVP_MD_CTX *ctx = EVP_MD_CTX_new();" >> $@ @@ -90,7 +90,7 @@ skip-$(LIB): $(call check_dep, \ "$(LIB)", \ $^, \ - "openssl-devel / libssl-dev version >= 1.1.0", \ + "openssl-devel / libssl-dev version >= 1.1.1", \ "HAVE_OPENSSL=0", \ "-I.") $(call check_dep, \