Patchwork efl/libecore: fix build with gcrypt

login
register
mail settings
Submitter Thomas Petazzoni
Date Jan. 1, 2013, 1:23 p.m.
Message ID <1357046638-2195-1-git-send-email-thomas.petazzoni@free-electrons.com>
Download mbox | patch
Permalink /patch/208905/
State Accepted
Headers show

Comments

Thomas Petazzoni - Jan. 1, 2013, 1:23 p.m.
When building with gnutls, libecore also needs libgcrypt.

Fixes:

  http://autobuild.buildroot.org/results/4da454d6414cf8f4e638defae9b793fb46a0a072/build-end.log

While we're at it, also explicit the --enable-openssl /
--disable-openssl depending on whether openssl is available or not.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/efl/libecore/libecore.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
Peter Korsgaard - Jan. 1, 2013, 2:36 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> When building with gnutls, libecore also needs libgcrypt.
 Thomas> Fixes:

 Thomas>   http://autobuild.buildroot.org/results/4da454d6414cf8f4e638defae9b793fb46a0a072/build-end.log

 Thomas> While we're at it, also explicit the --enable-openssl /
 Thomas> --disable-openssl depending on whether openssl is available or not.

 Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Thomas> ---
 Thomas>  package/efl/libecore/libecore.mk |    8 +++++++-
 Thomas>  1 file changed, 7 insertions(+), 1 deletion(-)

 Thomas> diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
 Thomas> index 0220017..e824bfa 100644
 Thomas> --- a/package/efl/libecore/libecore.mk
 Thomas> +++ b/package/efl/libecore/libecore.mk
 Thomas> @@ -36,10 +36,16 @@ endif
 
 Thomas>  ifeq ($(BR2_PACKAGE_OPENSSL),y)
 Thomas>  LIBECORE_DEPENDENCIES += openssl
 Thomas> +LIBECORE_CONF_OPT += --enable-openssl
 Thomas> +else
 Thomas> +LIBECORE_CONF_OPT += --disable-openssl
 Thomas>  endif
 
 Thomas>  ifeq ($(BR2_PACKAGE_GNUTLS),y)
 Thomas> -LIBECORE_DEPENDENCIES += gnutls
 Thomas> +LIBECORE_DEPENDENCIES += gnutls libgcrypt

No, we shouldn't pull in dependencies behind the users' back. I've
changed it to only activate when both gnutls and libgcrypt are present.

Committed with that change, thanks.
Thomas Petazzoni - Jan. 1, 2013, 2:56 p.m.
Dear Peter Korsgaard,

On Tue, 01 Jan 2013 15:36:31 +0100, Peter Korsgaard wrote:

> No, we shouldn't pull in dependencies behind the users' back. I've
> changed it to only activate when both gnutls and libgcrypt are present.
> 
> Committed with that change, thanks.

Ack, thanks!

Thomas

Patch

diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
index 0220017..e824bfa 100644
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -36,10 +36,16 @@  endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBECORE_DEPENDENCIES += openssl
+LIBECORE_CONF_OPT += --enable-openssl
+else
+LIBECORE_CONF_OPT += --disable-openssl
 endif
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
-LIBECORE_DEPENDENCIES += gnutls
+LIBECORE_DEPENDENCIES += gnutls libgcrypt
+LIBECORE_CONF_OPT += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+else
+LIBECORE_CONF_OPT += --disable-gnutls
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)