summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe MacDonald <joe_macdonald@mentor.com>2015-03-13 13:50:38 -0400
committerJoe MacDonald <joe_macdonald@mentor.com>2015-03-13 14:32:34 -0400
commit3c9880fc79f601e44f1c99ad259298ffd254971d (patch)
treeea156e5d25791117bf3380119abbd9e6f843282f
parent7f274585316a3ac85b3b14f4bb8a297662141f05 (diff)
downloadmeta-openembedded-3c9880fc79f601e44f1c99ad259298ffd254971d.tar.gz
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@mentor.com>
-rw-r--r--meta-networking/recipes-protocols/openflow/openflow.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-networking/recipes-protocols/openflow/openflow.inc b/meta-networking/recipes-protocols/openflow/openflow.inc
index 1a226f82c..75d8ab8d7 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"
15 15
16DEPENDS = "virtual/libc" 16DEPENDS = "virtual/libc"
17 17
18EXTRA_OECONF += "KARCH=${TARGET_ARCH}"
19
20PACKAGECONFIG ??= "openssl" 18PACKAGECONFIG ??= "openssl"
21PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl" 19PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl"
22 20
21EXTRA_OECONF += " \
22 KARCH=${TARGET_ARCH} \
23 ${@base_contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \
24 "
25
23S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
24 27
25inherit autotools-brokensep 28inherit autotools-brokensep