[oe-commits] Joe MacDonald : openflow: add libcrypto to static openflow library

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 3c9880fc79f601e44f1c99ad259298ffd254971d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=3c9880fc79f601e44f1c99ad259298ffd254971d

Author: Joe MacDonald <joe_macdonald at mentor.com>
Date:   Fri Mar 13 13:50:38 2015 -0400

openflow: add libcrypto to static openflow library

An update in OpenSSL removed the -lcrypto from libssl's pkg-config
options.  The old behaviour always linked it with -lssl, so revert to that
for now.

Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>

---

 meta-networking/recipes-protocols/openflow/openflow.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-networking/recipes-protocols/openflow/openflow.inc
index 1a226f8..75d8ab8 100644
--- a/meta-networking/recipes-protocols/openflow/openflow.inc
+++ b/meta-networking/recipes-protocols/openflow/openflow.inc
@@ -15,11 +15,14 @@ SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git"
 
 DEPENDS = "virtual/libc"
 
-EXTRA_OECONF += "KARCH=${TARGET_ARCH}"
-
 PACKAGECONFIG ??= "openssl"
 PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl"
 
+EXTRA_OECONF += " \
+                 KARCH=${TARGET_ARCH} \
+                 ${@base_contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \
+                "
+
 S = "${WORKDIR}/git"
 
 inherit autotools-brokensep