From 1bfa78896f6fe2ed5cd4558ea4040023d2f353eb Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Tue, 18 Apr 2023 13:56:14 +0200 Subject: [PATCH] libpv|pvattest: do not link against openssl Neither libpv nor pvattest uses libssl functionality directly, so let's remove it from the pkg-config calls. $ pkg-config --libs openssl -lssl -lcrypto $ pkg-config --libs libcrypto -lcrypto Reviewed-by: Steffen Eiden Signed-off-by: Marc Hartmayer Signed-off-by: Steffen Eiden --- libpv/Makefile | 6 +++--- pvattest/src/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libpv/Makefile b/libpv/Makefile index 5b518c73..9bd0dbd3 100644 --- a/libpv/Makefile +++ b/libpv/Makefile @@ -8,15 +8,15 @@ LIB := libpv.a ifneq ($(shell sh -c 'command -v pkg-config'),) GLIB2_CFLAGS := $(shell pkg-config --silence-errors --cflags glib-2.0) GLIB2_LIBS := $(shell pkg-config --silence-errors --libs glib-2.0) -LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto openssl) -LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto openssl) +LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto) +LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto) LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl) LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl) else GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include GLIB2_LIBS := -lglib-2.0 LIBCRYPTO_CFLAGS := -LIBCRYPTO_LIBS := -lcrypto -lssl +LIBCRYPTO_LIBS := -lcrypto LIBCURL_CFLAGS := -I/usr/include/s390x-linux-gnu LIBCURL_LIBS := -lcurl endif diff --git a/pvattest/src/Makefile b/pvattest/src/Makefile index cd56af01..d0aef3d2 100644 --- a/pvattest/src/Makefile +++ b/pvattest/src/Makefile @@ -31,15 +31,15 @@ $(BIN_PROGRAM)_OBJS := $($(BIN_PROGRAM)_SRCS:.c=.o) ifneq ($(shell sh -c 'command -v pkg-config'),) GLIB2_CFLAGS := $(shell pkg-config --silence-errors --cflags glib-2.0) GLIB2_LIBS := $(shell pkg-config --silence-errors --libs glib-2.0) -LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto openssl) -LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto openssl) +LIBCRYPTO_CFLAGS := $(shell pkg-config --silence-errors --cflags libcrypto) +LIBCRYPTO_LIBS := $(shell pkg-config --silence-errors --libs libcrypto) LIBCURL_CFLAGS := $(shell pkg-config --silence-errors --cflags libcurl) LIBCURL_LIBS := $(shell pkg-config --silence-errors --libs libcurl) else GLIB2_CFLAGS := -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include GLIB2_LIBS := -lglib-2.0 LIBCRYPTO_CFLAGS := -LIBCRYPTO_LIBS := -lcrypto -lssl +LIBCRYPTO_LIBS := -lcrypto LIBCURL_CFLAGS := -I/usr/include/s390x-linux-gnu LIBCURL_LIBS := -lcurl endif