* [PATCH] openssl: fix libssl.pc to Require libcrypto
@ 2015-03-16 5:53 Saul Wold
2015-03-16 6:16 ` Robert Yang
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2015-03-16 5:53 UTC (permalink / raw)
To: openembedded-core
The 1.0.2 version of libssl requires that libcrypto be linked so don't
keep it private anymore.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../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
@@ -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
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] openssl: fix libssl.pc to Require libcrypto
2015-03-16 5:53 [PATCH] openssl: fix libssl.pc to Require libcrypto Saul Wold
@ 2015-03-16 6:16 ` Robert Yang
2015-03-16 15:43 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Robert Yang @ 2015-03-16 6:16 UTC (permalink / raw)
To: Saul Wold, openembedded-core
I'm afraid that it doesn't work, the error is the same as before
for openflow.
// Robert
On 03/16/2015 01:53 PM, Saul Wold 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 <sgw@linux.intel.com>
> ---
> .../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
> @@ -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
> 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"
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] openssl: fix libssl.pc to Require libcrypto
2015-03-16 6:16 ` Robert Yang
@ 2015-03-16 15:43 ` Saul Wold
0 siblings, 0 replies; 3+ messages in thread
From: Saul Wold @ 2015-03-16 15:43 UTC (permalink / raw)
To: Robert Yang, openembedded-core
On 03/16/2015 12:16 AM, Robert Yang wrote:
>
> 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!
> // Robert
>
> On 03/16/2015 01:53 PM, Saul Wold 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 <sgw@linux.intel.com>
>> ---
>> .../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
>>
>> @@ -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
>> 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"
>>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-16 15:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-16 5:53 [PATCH] openssl: fix libssl.pc to Require libcrypto Saul Wold
2015-03-16 6:16 ` Robert Yang
2015-03-16 15:43 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox