* [Buildroot] [PATCH 1/1] package/s390-tools: update third patch
@ 2021-08-06 14:44 Fabrice Fontaine
2021-08-07 8:58 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2021-08-06 14:44 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Alexander Egorenkov
Update third patch to fix the following build failure:
/bin/sh: 1: curl-config: not found
make[2]: Leaving directory '/tmp/instance-2/output-1/build/s390-tools-2.17.0/libvmdump'
Error: libcurl is not built with the OpenSSL backend
make[2]: *** [Makefile:54: check-dep-libekmfweb] Error 1
Fixes:
- http://autobuild.buildroot.org/results/b4ebe39e54f80b26bc81b249bfa643140c41d0bd
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...0003-Makefile-add-CURL-XML2-_CONFIG.patch} | 47 ++++++++++++++++---
1 file changed, 40 insertions(+), 7 deletions(-)
rename package/s390-tools/{0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch => 0003-Makefile-add-CURL-XML2-_CONFIG.patch} (59%)
diff --git a/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch b/package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch
similarity index 59%
rename from package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch
rename to package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch
index 2f6ea5a11c..4ac0b8b029 100644
--- a/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch
+++ b/package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch
@@ -1,7 +1,7 @@
-From 49cd01dc97740b299119f32c822ccfd989ea7ec9 Mon Sep 17 00:00:00 2001
+From c2c310e93a5af148d37323f8d873e5656dea8b64 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
+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
@@ -20,11 +20,47 @@ Fixes:
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/ibm-s390-linux/s390-tools/pull/121]
---
+ libekmfweb/Makefile | 10 ++++++----
libkmipclient/Makefile | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
+ 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 36efecb..addd096 100644
+index 36efecb4..addd0965 100644
--- a/libkmipclient/Makefile
+++ b/libkmipclient/Makefile
@@ -50,6 +50,9 @@ detect-openssl-version.dep:
@@ -66,6 +102,3 @@ index 36efecb..addd096 100644
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
-
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/s390-tools: update third patch
2021-08-06 14:44 [Buildroot] [PATCH 1/1] package/s390-tools: update third patch Fabrice Fontaine
@ 2021-08-07 8:58 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2021-08-07 8:58 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: Alexander Egorenkov, buildroot
Fabrice, All,
On 2021-08-06 16:44 +0200, Fabrice Fontaine spake thusly:
> Update third patch to fix the following build failure:
>
> /bin/sh: 1: curl-config: not found
> make[2]: Leaving directory '/tmp/instance-2/output-1/build/s390-tools-2.17.0/libvmdump'
> Error: libcurl is not built with the OpenSSL backend
> make[2]: *** [Makefile:54: check-dep-libekmfweb] Error 1
>
> Fixes:
> - http://autobuild.buildroot.org/results/b4ebe39e54f80b26bc81b249bfa643140c41d0bd
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
I've changed the title to be more informative:
package/s390-tools: properly fix build with libcurl
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> ...0003-Makefile-add-CURL-XML2-_CONFIG.patch} | 47 ++++++++++++++++---
> 1 file changed, 40 insertions(+), 7 deletions(-)
> rename package/s390-tools/{0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch => 0003-Makefile-add-CURL-XML2-_CONFIG.patch} (59%)
>
> diff --git a/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch b/package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch
> similarity index 59%
> rename from package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch
> rename to package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch
> index 2f6ea5a11c..4ac0b8b029 100644
> --- a/package/s390-tools/0003-libkmipclient-Makefile-add-CURL-XML2-_CONFIG.patch
> +++ b/package/s390-tools/0003-Makefile-add-CURL-XML2-_CONFIG.patch
> @@ -1,7 +1,7 @@
> -From 49cd01dc97740b299119f32c822ccfd989ea7ec9 Mon Sep 17 00:00:00 2001
> +From c2c310e93a5af148d37323f8d873e5656dea8b64 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
> +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
> @@ -20,11 +20,47 @@ Fixes:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> [Upstream status: https://github.com/ibm-s390-linux/s390-tools/pull/121]
> ---
> + libekmfweb/Makefile | 10 ++++++----
> libkmipclient/Makefile | 13 ++++++++-----
> - 1 file changed, 8 insertions(+), 5 deletions(-)
> + 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 36efecb..addd096 100644
> +index 36efecb4..addd0965 100644
> --- a/libkmipclient/Makefile
> +++ b/libkmipclient/Makefile
> @@ -50,6 +50,9 @@ detect-openssl-version.dep:
> @@ -66,6 +102,3 @@ index 36efecb..addd096 100644
> 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
> -
> --
> 2.30.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-07 8:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-06 14:44 [Buildroot] [PATCH 1/1] package/s390-tools: update third patch Fabrice Fontaine
2021-08-07 8:58 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.