efl/libecore: fix build with gcrypt

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.

---
 package/efl/libecore/libecore.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

index 0220017..e824bfa 100644
@@ -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)

1.7.9.5

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 <[email protected]> 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.

Bye, Peter Korsgaard

Dear Peter Korsgaard,

Ack, thanks!

Thomas

Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com