On 03/16/2015 07:48 PM, Khem Raj wrote:

On Mar 16, 2015, at 6:35 PM, Saul Wold <[email protected]> wrote:

The 1.0.2 version of libssl requires that libcrypto be linked so don't
keep it private anymore.

Signed-off-by: Saul Wold <[email protected]>
---
.../openssl/fix_Makefile_creation_of_libssl.patch        | 16 ++++++++++++++++
meta/recipes-connectivity/openssl/openssl_1.0.2.bb       |  1 +
2 files changed, 17 insertions(+)
create mode 100644 
meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch

diff --git 
a/meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch
 
b/meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch
new file mode 100644
index 0000000..e76ab2e
--- /dev/null
+++ 
b/meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Pending
+Signed-off-by: Saul Wold <[email protected]>
+
+Index: openssl-1.0.2/Makefile.org
+===================================================================
+--- openssl-1.0.2.orig/Makefile.org
++++ openssl-1.0.2/Makefile.org
+@@ -381,7 +381,7 @@ libssl.pc: Makefile
+           echo 'Description: Secure Sockets Layer and cryptography 
libraries'; \
+           echo 'Version: '$(VERSION); \
+           echo 'Requires.private: libcrypto'; \
+-          echo 'Libs: -L$${libdir} -lssl'; \
++          echo 'Libs: -L$${libdir} -lssl -lcrypto'; \

There must be a reason why upstream changed it to be private. What is the 
reason ?
since reverting like this can have consequences, we need to understand this.

Ok drop this patch, it means that we need to fix the openflow recipe since it really is using APIs from both libssl and libcrypto which can be summed up by using the openssl.pc instead of trying to just use libssl.pc which was used because of history in openflow.

Patches to meta-oe will be forth coming for openflow to use openssl.pc and a pyopenssl upgrade.

Sorry for the noise here.

Sau!
+           echo 'Libs.private: $(EX_LIBS)'; \
+           echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
+
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2.bb 
b/meta/recipes-connectivity/openssl/openssl_1.0.2.bb
index 79537f9..a980855 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2.bb
@@ -37,6 +37,7 @@ SRC_URI += "file://configure-targets.patch \
             file://Makefiles-ptest.patch \
             file://ptest-deps.patch \
             file://run-ptest \
+            file://fix_Makefile_creation_of_libssl.patch \
            "

SRC_URI[md5sum] = "38373013fc85c790aabf8837969c5eba"
--
2.1.0

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core



--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to