Patchwork libfreefare: add missing openssl dependency

login
register
mail settings
Submitter Simon Dawson
Date June 17, 2012, 9:07 a.m.
Message ID <1339924060-4250-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/165331/
State Accepted
Headers show

Comments

Simon Dawson - June 17, 2012, 9:07 a.m.
From: Simon Dawson <spdawson@gmail.com>

If openssl is not selected, configuration fails for the libfreefare package
as follows.

  configure: error: Cannot find libcrypto.

This patch adds the missing dependency on openssl.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 package/libfreefare/Config.in      |    4 ++++
 package/libfreefare/libfreefare.mk |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
Peter Korsgaard - June 17, 2012, 10:20 a.m.
>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>
 spdawson> If openssl is not selected, configuration fails for the libfreefare package
 spdawson> as follows.

 spdawson>   configure: error: Cannot find libcrypto.

 spdawson> This patch adds the missing dependency on openssl.

 spdawson> Signed-off-by: Simon Dawson <spdawson@gmail.com>
 spdawson> ---
 spdawson>  package/libfreefare/Config.in      |    4 ++++
 spdawson>  package/libfreefare/libfreefare.mk |    2 +-
 spdawson>  2 files changed, 5 insertions(+), 1 deletion(-)

 spdawson> diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
 spdawson> index 2e11f7e..438bcbf 100644
 spdawson> --- a/package/libfreefare/Config.in
 spdawson> +++ b/package/libfreefare/Config.in
 spdawson> @@ -1,7 +1,11 @@
 spdawson>  config BR2_PACKAGE_LIBFREEFARE
 spdawson>  	bool "libfreefare"
 spdawson> +	depends on BR2_PACKAGE_OPENSSL

We normally use 'depends on' for library dependencies (like libnfc), so
I've changed that and committed, thanks.
Baruch Siach - June 17, 2012, 10:30 a.m.
Hi Peter,

On Sun, Jun 17, 2012 at 12:20:03PM +0200, Peter Korsgaard wrote:
> >>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:
> 
>  spdawson> From: Simon Dawson <spdawson@gmail.com>
>  spdawson> If openssl is not selected, configuration fails for the libfreefare package
>  spdawson> as follows.
> 
>  spdawson>   configure: error: Cannot find libcrypto.
> 
>  spdawson> This patch adds the missing dependency on openssl.
> 
>  spdawson> Signed-off-by: Simon Dawson <spdawson@gmail.com>
>  spdawson> ---
>  spdawson>  package/libfreefare/Config.in      |    4 ++++
>  spdawson>  package/libfreefare/libfreefare.mk |    2 +-
>  spdawson>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
>  spdawson> diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
>  spdawson> index 2e11f7e..438bcbf 100644
>  spdawson> --- a/package/libfreefare/Config.in
>  spdawson> +++ b/package/libfreefare/Config.in
>  spdawson> @@ -1,7 +1,11 @@
>  spdawson>  config BR2_PACKAGE_LIBFREEFARE
>  spdawson>  	bool "libfreefare"
>  spdawson> +	depends on BR2_PACKAGE_OPENSSL
> 
> We normally use 'depends on' for library dependencies (like libnfc), so
> I've changed that and committed, thanks.

s/depends on/select/

baruch
Peter Korsgaard - June 17, 2012, 12:10 p.m.
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 spdawson> config BR2_PACKAGE_LIBFREEFARE
 spdawson> bool "libfreefare"
 spdawson> +	depends on BR2_PACKAGE_OPENSSL
 >> 
 >> We normally use 'depends on' for library dependencies (like libnfc), so
 >> I've changed that and committed, thanks.

 Baruch> s/depends on/select/

Yes ;)

Patch

diff --git a/package/libfreefare/Config.in b/package/libfreefare/Config.in
index 2e11f7e..438bcbf 100644
--- a/package/libfreefare/Config.in
+++ b/package/libfreefare/Config.in
@@ -1,7 +1,11 @@ 
 config BR2_PACKAGE_LIBFREEFARE
 	bool "libfreefare"
+	depends on BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBNFC
 	help
 	  Library for high level manipulation of MIFARE cards.
 
 	  http://code.google.com/p/nfc-tools/wiki/libfreefare
+
+comment "libfreefare requires openssl"
+	depends on !BR2_PACKAGE_OPENSSL
diff --git a/package/libfreefare/libfreefare.mk b/package/libfreefare/libfreefare.mk
index 0499999..16ef8fb 100644
--- a/package/libfreefare/libfreefare.mk
+++ b/package/libfreefare/libfreefare.mk
@@ -5,6 +5,6 @@ 
 #############################################################
 LIBFREEFARE_VERSION = 0.3.2
 LIBFREEFARE_SITE = http://nfc-tools.googlecode.com/files
-LIBFREEFARE_DEPENDENCIES = libnfc
+LIBFREEFARE_DEPENDENCIES = libnfc openssl
 
 $(eval $(call AUTOTARGETS))