From c2c310e93a5af148d37323f8d873e5656dea8b64 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 1 Aug 2021 21:50:21 +0200 Subject: [PATCH] Makefile: add {CURL,XML2}_CONFIG Add CURL_CONFIG and XML2_CONFIG to allow the user to configure the binaries used in check-dep-libkmipclient This will allow the user to avoid the following build failures raised since version 2.17.0 and https://github.com/ibm-s390-linux/s390-tools/commit/56fecf1832c3ebc4626ddf5c598762833c362d5e: /bin/sh: 1: curl-config: not found Error: libcurl is not built with the OpenSSL backend make[2]: *** [Makefile:54: check-dep-libekmfweb] Error 1 Fixes: - http://autobuild.buildroot.org/results/cfb46d7547c22f0a23aca2286dc5a1d2c20aadfc Signed-off-by: Fabrice Fontaine [Upstream status: https://github.com/ibm-s390-linux/s390-tools/pull/121] --- libekmfweb/Makefile | 10 ++++++---- libkmipclient/Makefile | 13 ++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile index 8e12fb56..1c776996 100644 --- a/libekmfweb/Makefile +++ b/libekmfweb/Makefile @@ -47,6 +47,8 @@ detect-openssl-version.dep: echo "}" >> $(TMPFILE) mv $(TMPFILE) $@ +CURL_CONFIG ?= curl-config + check-dep-libekmfweb: detect-openssl-version.dep $(call check_dep, \ "libekmfweb", \ @@ -64,8 +66,8 @@ check-dep-libekmfweb: detect-openssl-version.dep "curl/curl.h", \ "libcurl-devel", \ "HAVE_LIBCURL=0" \ - `curl-config --cflags` `curl-config --libs`) - curl-config --ssl-backends | grep OpenSSL >/dev/null 2>&1 || { echo "Error: libcurl is not built with the OpenSSL backend"; exit 1; } + `$(CURL_CONFIG) --cflags` `$(CURL_CONFIG) --libs`) + $(CURL_CONFIG) --ssl-backends | grep OpenSSL >/dev/null 2>&1 || { echo "Error: libcurl is not built with the OpenSSL backend"; exit 1; } touch check-dep-libekmfweb skip-libekmfweb-openssl: @@ -83,8 +85,8 @@ ekmfweb.o: check-dep-libekmfweb ekmfweb.c utilities.h cca.h $(rootdir)include/ek utilities.o: check-dep-libekmfweb utilities.c utilities.h $(rootdir)include/ekmfweb/ekmfweb.h cca.o: check-dep-libekmfweb cca.c cca.h utilities.h $(rootdir)include/ekmfweb/ekmfweb.h -libekmfweb.so.$(VERSION): ALL_CFLAGS += -fPIC `curl-config --cflags` -libekmfweb.so.$(VERSION): LDLIBS = -ljson-c -lcrypto -lssl `curl-config --libs` -ldl +libekmfweb.so.$(VERSION): ALL_CFLAGS += -fPIC `$(CURL_CONFIG) --cflags` +libekmfweb.so.$(VERSION): LDLIBS = -ljson-c -lcrypto -lssl `$(CURL_CONFIG) --libs` -ldl libekmfweb.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libekmfweb.map \ -Wl,-z,defs,-Bsymbolic -Wl,-soname,libekmfweb.so.$(VERM) libekmfweb.so.$(VERSION): ekmfweb.o utilities.o cca.o $(libs) diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile index 36efecb4..addd0965 100644 --- a/libkmipclient/Makefile +++ b/libkmipclient/Makefile @@ -50,6 +50,9 @@ detect-openssl-version.dep: echo "}" >> $(TMPFILE) mv $(TMPFILE) $@ +CURL_CONFIG ?= curl-config +XML2_CONFIG ?= xml2-config + check-dep-libkmipclient: detect-openssl-version.dep $(call check_dep, \ "libkmipclient", \ @@ -67,14 +70,14 @@ check-dep-libkmipclient: detect-openssl-version.dep "libxml/tree.h", \ "libxml2-devel", \ "HAVE_LIBXML2=0", \ - `xml2-config --cflags` `xml2-config --libs`) + `$(XML2_CONFIG) --cflags` `$(XML2_CONFIG) --libs`) $(call check_dep, \ "libkmipclient", \ "curl/curl.h", \ "libcurl-devel", \ "HAVE_LIBCURL=0" \ - `curl-config --cflags` `curl-config --libs`) - curl-config --ssl-backends | grep OpenSSL >/dev/null 2>&1 || { echo "Error: libcurl is not built with the OpenSSL backend"; exit 1; } + `$(CURL_CONFIG) --cflags` `$(CURL_CONFIG) --libs`) + $(CURL_CONFIG) --ssl-backends | grep OpenSSL >/dev/null 2>&1 || { echo "Error: libcurl is not built with the OpenSSL backend"; exit 1; } touch check-dep-libkmipclient skip-libkmipclient-openssl: @@ -104,8 +107,8 @@ tls.o: check-dep-libkmipclient tls.c kmip.h utils.h $(rootdir)include/kmipclient names.o: check-dep-libkmipclient names.c names.h utils.h $(rootdir)include/kmipclient/kmipclient.h utils.o: check-dep-libkmipclient utils.c names.h utils.h $(rootdir)include/kmipclient/kmipclient.h -libkmipclient.so.$(VERSION): ALL_CFLAGS += -fPIC `xml2-config --cflags` `curl-config --cflags` -libkmipclient.so.$(VERSION): LDLIBS = -ljson-c -lcrypto -lssl `xml2-config --libs` `curl-config --libs` +libkmipclient.so.$(VERSION): ALL_CFLAGS += -fPIC `$(XML2_CONFIG) --cflags` `$(CURL_CONFIG) --cflags` +libkmipclient.so.$(VERSION): LDLIBS = -ljson-c -lcrypto -lssl `$(XML2_CONFIG) --libs` `$(CURL_CONFIG) --libs` libkmipclient.so.$(VERSION): ALL_LDFLAGS += -shared -Wl,--version-script=libkmipclient.map \ -Wl,-z,defs,-Bsymbolic -Wl,-soname,libkmipclient.so.$(VERM) libkmipclient.so.$(VERSION): kmip.o request.o response.o attribute.o key.o ttlv.o json.o \