[Buildroot] [PATCH 1/1] libcurl: fix build with ssh2 and static mbedtls

[Buildroot] [PATCH 1/1] libcurl: fix build with ssh2 and static mbedtls

[Fabrice Fontaine]

The ssh2 pkg-config file could contain the following lines when build
with a static version of mbedtls:
   Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
   Libs.private: /xxx/libmbedcrypto.a

This static mbedtls library must be used to correctly detect ssh2
support and this library must be copied in libcurl.pc otherwise
compilation of any application (such as upmpdcli) with libcurl will fail
when trying to found mbedtls functions included in libssh2.
So, replace pkg-config --libs-only-l by pkg-config --libs.

Fixes:
 - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...ink-with-ssh2-built-with-a-static-mbedtls.patch | 40 ++++++++++++++++++++++
 package/libcurl/libcurl.mk                         |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch

diff --git a/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch b/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch
new file mode 100644
index 0000000000..9107fa7c8c
--- /dev/null
+++ b/package/libcurl/0001-Fix-link-with-ssh2-built-with-a-static-mbedtls.patch
@@ -0,0 +1,40 @@
+From b5fbc486e805805efb8400373ccec2a3dee1c81b Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 21 May 2018 12:07:00 +0200
+Subject: [PATCH 1/1] Fix link with ssh2 built with a static mbedtls
+
+The ssh2 pkg-config file could contain the following lines when build
+with a static version of mbedtls:
+   Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
+   Libs.private: /xxx/libmbedcrypto.a
+
+This static mbedtls library must be used to correctly detect ssh2
+support and this library must be copied in libcurl.pc otherwise
+compilation of any application (such as upmpdcli) with libcurl will fail
+when trying to found mbedtls functions included in libssh2.
+So, replace pkg-config --libs-only-l by pkg-config --libs.
+
+Fixes:
+ - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5569a26b4..9e2606885 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -2766,7 +2766,7 @@ if test X"$OPT_LIBSSH2" != Xno; then
+     CURL_CHECK_PKGCONFIG(libssh2)
+ 
+     if test "$PKGCONFIG" != "no" ; then
+-      LIB_SSH2=`$PKGCONFIG --libs-only-l libssh2`
++      LIB_SSH2=`$PKGCONFIG --libs libssh2`
+       LD_SSH2=`$PKGCONFIG --libs-only-L libssh2`
+       CPP_SSH2=`$PKGCONFIG --cflags-only-I libssh2`
+       version=`$PKGCONFIG --modversion libssh2`
+-- 
+2.14.1
+
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index fbaeaa8975..25d74394c7 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -14,6 +14,8 @@ LIBCURL_DEPENDENCIES = host-pkgconf \
 LIBCURL_LICENSE = curl
 LIBCURL_LICENSE_FILES = COPYING
 LIBCURL_INSTALL_STAGING = YES
+# We're patching configure.ac
+LIBCURL_AUTORECONF = YES
 
 # We disable NTLM support because it uses fork(), which doesn't work
 # on non-MMU platforms. Moreover, this authentication method is
-- 
2.14.1

[Buildroot] [PATCH 1/1] libcurl: fix build with ssh2 and static mbedtls

[Thomas Petazzoni]

Hello,

On Mon, 21 May 2018 13:41:08 +0200, Fabrice Fontaine wrote:
> The ssh2 pkg-config file could contain the following lines when build
> with a static version of mbedtls:
>    Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
>    Libs.private: /xxx/libmbedcrypto.a

I find it weird to have the same library in both Libs and Libs.private.

Either it's a direct dependency of ssh2 and it should be in Libs. Or
it's an indirect dependency of ssh2 and should only be used when static
linking, in which case it should be only in Libs.private.

Section thing that looks weird is: why a full path to libmbedcrypto.a
and not a -l flag ?

> This static mbedtls library must be used to correctly detect ssh2
> support and this library must be copied in libcurl.pc otherwise
> compilation of any application (such as upmpdcli) with libcurl will fail
> when trying to found mbedtls functions included in libssh2.
> So, replace pkg-config --libs-only-l by pkg-config --libs.

That being said, the libcurl change looks good to me. Did you submit it
upstream ?

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] libcurl: fix build with ssh2 and static mbedtls

[Fabrice Fontaine]

Dear Thomas,

2018-05-22 23:06 GMT+02:00 Thomas Petazzoni <thomas.petazzoni@bootlin.com>:

> Hello,
>
> On Mon, 21 May 2018 13:41:08 +0200, Fabrice Fontaine wrote:
> > The ssh2 pkg-config file could contain the following lines when build
> > with a static version of mbedtls:
> >    Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
> >    Libs.private: /xxx/libmbedcrypto.a
>
> I find it weird to have the same library in both Libs and Libs.private.
>
> Either it's a direct dependency of ssh2 and it should be in Libs. Or
> it's an indirect dependency of ssh2 and should only be used when static
> linking, in which case it should be only in Libs.private.
>
> Section thing that looks weird is: why a full path to libmbedcrypto.a
> and not a -l flag ?
>
Indeed, this seems pretty weird to me too.
This patch to libssh2 was added recently to buildroot (see
http://patchwork.ozlabs.org/patch/888395) by Baruch (now in cc).
It seems that this full path is returned by the AC_LIB_HAVE_LINKFLAGS
function, see https://github.com/libssh2/libssh2/blob/master/acinclude.m4.
So, perhaps we could find a better patch for libssh2 instead of patching
libcurl.

> > This static mbedtls library must be used to correctly detect ssh2
> > support and this library must be copied in libcurl.pc otherwise
> > compilation of any application (such as upmpdcli) with libcurl will fail
> > when trying to found mbedtls functions included in libssh2.
> > So, replace pkg-config --libs-only-l by pkg-config --libs.
>
> That being said, the libcurl change looks good to me. Did you submit it
> upstream ?
>
No, I didn't send the patch upstream yet. I wanted to get your feedback
first.



>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180522/62d3c9c1/attachment.html>

[Buildroot] [PATCH 1/1] libcurl: fix build with ssh2 and static mbedtls

[Thomas Petazzoni]

Hello,

On Tue, 22 May 2018 23:43:00 +0200, Fabrice Fontaine wrote:

> > Either it's a direct dependency of ssh2 and it should be in Libs. Or
> > it's an indirect dependency of ssh2 and should only be used when static
> > linking, in which case it should be only in Libs.private.
> >
> > Section thing that looks weird is: why a full path to libmbedcrypto.a
> > and not a -l flag ?
> >  
> Indeed, this seems pretty weird to me too.
> This patch to libssh2 was added recently to buildroot (see
> http://patchwork.ozlabs.org/patch/888395) by Baruch (now in cc).
> It seems that this full path is returned by the AC_LIB_HAVE_LINKFLAGS
> function, see https://github.com/libssh2/libssh2/blob/master/acinclude.m4.
> So, perhaps we could find a better patch for libssh2 instead of patching
> libcurl.

Indeed the resulting .pc file from libssh2 looks strange. But however,
I think your change to libcurl remains valid. 'pkg-config --libs' is
what should be used to get the linker flags. I don't see why libcurl
should filter the options and only keep the -l options. Other linker
options may be important.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/1] libcurl: fix build with ssh2 and static mbedtls

[Peter Korsgaard]

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

 > The ssh2 pkg-config file could contain the following lines when build
 > with a static version of mbedtls:
 >    Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
 >    Libs.private: /xxx/libmbedcrypto.a

 > This static mbedtls library must be used to correctly detect ssh2
 > support and this library must be copied in libcurl.pc otherwise
 > compilation of any application (such as upmpdcli) with libcurl will fail
 > when trying to found mbedtls functions included in libssh2.
 > So, replace pkg-config --libs-only-l by pkg-config --libs.

 > Fixes:
 >  - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks. Please submit the patch upstream.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/1] libcurl: fix build with ssh2 and static mbedtls

[Peter Korsgaard]

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

 > The ssh2 pkg-config file could contain the following lines when build
 > with a static version of mbedtls:
 >    Libs: -L${libdir} -lssh2 /xxx/libmbedcrypto.a
 >    Libs.private: /xxx/libmbedcrypto.a

 > This static mbedtls library must be used to correctly detect ssh2
 > support and this library must be copied in libcurl.pc otherwise
 > compilation of any application (such as upmpdcli) with libcurl will fail
 > when trying to found mbedtls functions included in libssh2.
 > So, replace pkg-config --libs-only-l by pkg-config --libs.

 > Fixes:
 >  - http://autobuild.buildroot.net/results/43e24b22a77f616d6198c10435dcc23cc3b9088a

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2018.02.x, thanks.

-- 
Bye, Peter Korsgaard