Skip to contentSkip to conversation

openssl: fix libssl.pc to Require libcrypto

PATCH Superseded Saul Wold 2 participants 3 messages Mar 16, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 openssl: fix libssl.pc to Require libcrypto

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/openssl/fix_Makefile_creation_of_libssl.patch   | 13 +++++++++++++
 meta/recipes-connectivity/openssl/openssl_1.0.2.bb          |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch
meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +13 -0
new file mode 100644
index 0000000..dbf1f3c
@@ -0,0 +1,13 @@
+Index: openssl-1.0.2/Makefile
+===================================================================
+--- openssl-1.0.2.orig/Makefile
++++ openssl-1.0.2/Makefile
+@@ -381,7 +381,7 @@ libssl.pc: Makefile
+ 	    echo 'Name: OpenSSL-libssl'; \
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+-	    echo 'Requires.private: libcrypto'; \
++	    echo 'Requires: libcrypto'; \
+ 	    echo 'Libs: -L$${libdir} -lssl'; \
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
meta/recipes-connectivity/openssl/openssl_1.0.2.bb +1 -0
index 79537f9..a980855 100644
@@ -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"
Signature · 1 line
2.1.0
#1 lore raw

I'm afraid that it doesn't work, the error is the same as before for openflow.

// Robert

Quoted 42 lines · Saul Wold

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/openssl/fix_Makefile_creation_of_libssl.patch   | 13 +++++++++++++
  meta/recipes-connectivity/openssl/openssl_1.0.2.bb          |  1 +
  2 files changed, 14 insertions(+)

create mode 100644 meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch

meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +13 -0
new file mode 100644
index 0000000..dbf1f3c
@@ -0,0 +1,13 @@
+Index: openssl-1.0.2/Makefile
+===================================================================
+--- openssl-1.0.2.orig/Makefile
++++ openssl-1.0.2/Makefile
+@@ -381,7 +381,7 @@ libssl.pc: Makefile
+ 	    echo 'Name: OpenSSL-libssl'; \
+ 	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
+ 	    echo 'Version: '$(VERSION); \
+-	    echo 'Requires.private: libcrypto'; \
++	    echo 'Requires: libcrypto'; \
+ 	    echo 'Libs: -L$${libdir} -lssl'; \
+ 	    echo 'Libs.private: $(EX_LIBS)'; \
+ 	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
meta/recipes-connectivity/openssl/openssl_1.0.2.bb +1 -0
index 79537f9..a980855 100644
@@ -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"
author
#2 lore raw
Quoted 4 lines · Robert Yang

I'm afraid that it doesn't work, the error is the same as before for openflow.

Hmm, I tested it here, will try again, I can change the Libs: entry, I know that works for sure.

Also I realized I sent it late and forgot to add the patch Upstream-Status info and SOB

Sau!

Quoted 57 lines

// Robert

Quoted 52 lines · Saul Wold

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/openssl/fix_Makefile_creation_of_libssl.patch   | 13
+++++++++++++
  meta/recipes-connectivity/openssl/openssl_1.0.2.bb          |  1 +
  2 files changed, 14 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..dbf1f3c
--- /dev/null
+++
b/meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch

meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +7 -0
@@ -0,0 +1,13 @@
+Index: openssl-1.0.2/Makefile
+===================================================================
+--- openssl-1.0.2.orig/Makefile
++++ openssl-1.0.2/Makefile
+@@ -381,7 +381,7 @@ libssl.pc: Makefile
+         echo 'Name: OpenSSL-libssl'; \
+         echo 'Description: Secure Sockets Layer and cryptography

libraries'; \

meta/recipes-connectivity/openssl/openssl/fix_Makefile_creation_of_libssl.patch new file +6 -0
+         echo 'Version: '$(VERSION); \
+-        echo 'Requires.private: libcrypto'; \
++        echo 'Requires: libcrypto'; \
+         echo 'Libs: -L$${libdir} -lssl'; \
+         echo 'Libs.private: $(EX_LIBS)'; \
+         echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
meta/recipes-connectivity/openssl/openssl_1.0.2.bb +1 -0
index 79537f9..a980855 100644
@@ -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"