[oe] [meta-networking][PATCH v2] openflow: add libcrypto to static openflow library

Joe MacDonald joe_macdonald at mentor.com
Fri Mar 13 18:36:40 UTC 2015


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>
---

Oops, v1 included one lingering bit of damage where I was also trying to correct
the B != S failures, that shouldn't be there.  Openflow is still broken if you
attempt to build outside of the source tree.

 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
-- 
1.9.1




More information about the Openembedded-devel mailing list