Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Egorenkov <egorenar@linux.ibm.com>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>, buildroot@buildroot.org
Cc: , Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: Re: [Buildroot] [PATCH v2, 1/2] package/s390-tools: fix build with curl
Date: Tue, 03 Aug 2021 09:10:42 +0200	[thread overview]
Message-ID: <8735rr3swd.fsf@oc8242746057.ibm.com> (raw)
In-Reply-To: <20210801204650.75712-1-fontaine.fabrice@gmail.com>
In-Reply-To: 

Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

> Build with curl is broken since bump to version 2.17.0 in commit
> eab9110afbef9c39569c4cc988aed15c48f7ce44 and
> https://github.com/ibm-s390-linux/s390-tools/commit/56fecf1832c3ebc4626ddf5c598762833c362d5e
>
> Fixes:
>  - http://autobuild.buildroot.org/results/cfb46d7547c22f0a23aca2286dc5a1d2c20aadfc
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Split patch
>  - Add CURL_CONFIG and XML2_CONFI
>
>  ...lient-Makefile-add-CURL-XML2-_CONFIG.patch | 71 +++++++++++++++++++
>  package/s390-tools/s390-tools.mk              |  1 +
>  2 files changed, 72 insertions(+)
>  create mode 100644 package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch
>
> diff --git a/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch b/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch
> new file mode 100644
> index 0000000000..2f6ea5a11c
> --- /dev/null
> +++ b/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch
> @@ -0,0 +1,71 @@
> +From 49cd01dc97740b299119f32c822ccfd989ea7ec9 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 1 Aug 2021 21:50:21 +0200
> +Subject: [PATCH] libkmipclient/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 <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/ibm-s390-linux/s390-tools/pull/121]
> +---
> + libkmipclient/Makefile | 13 ++++++++-----
> + 1 file changed, 8 insertions(+), 5 deletions(-)
> +
> +diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile
> +index 36efecb..addd096 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 \
> +-- 
> +2.30.2
> +
> diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk
> index 7f7df0542e..71a7f2223c 100644
> --- a/package/s390-tools/s390-tools.mk
> +++ b/package/s390-tools/s390-tools.mk
> @@ -20,6 +20,7 @@ S390_TOOLS_MAKE_OPTS = \
>  ifeq ($(BR2_PACKAGE_LIBCURL),y)
>  S390_TOOLS_DEPENDENCIES += libcurl
>  S390_TOOLS_MAKE_OPTS += \
> +	CURL_CONFIG=$(STAGING_DIR)/usr/bin/curl-config \
>  	HAVE_CURL=1 \
>  	HAVE_LIBCURL=1
>  else
> -- 
> 2.30.2

Thanks for fixing it.

Regards
Alex
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

      parent reply	other threads:[~2021-08-03  7:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-01 20:46 [Buildroot] [PATCH v2, 1/2] package/s390-tools: fix build with curl Fabrice Fontaine
2021-08-01 20:46 ` [Buildroot] [PATCH v2, 2/2] package/s390-tools: add libxml2 optional dependency Fabrice Fontaine
2021-08-01 21:03 ` [Buildroot] [PATCH v2, 1/2] package/s390-tools: fix build with curl Thomas Petazzoni
2021-08-01 21:16 ` Yann E. MORIN
2021-08-03  7:10 ` Alexander Egorenkov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8735rr3swd.fsf@oc8242746057.ibm.com \
    --to=egorenar@linux.ibm.com \
    --cc=buildroot@buildroot.org \
    --cc=fontaine.fabrice@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox