* [PATCH] openssl: Fix multilib header conflict - opensslconf.h
@ 2013-07-17 5:15 Ming Liu
2013-07-26 18:10 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Ming Liu @ 2013-07-17 5:15 UTC (permalink / raw)
To: openembedded-core
opensslconf.h conflicts between 32-bit and 64-bit versions.
Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
meta/recipes-connectivity/openssl/openssl.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index f5b2432..267eb89 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -5,7 +5,7 @@ BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
SECTION = "libs/network"
# Big Jump for OpenSSL 1.0 support with meta-oe
-INC_PR = "r15"
+INC_PR = "r16"
# "openssl | SSLeay" dual license
LICENSE = "openssl"
@@ -31,7 +31,7 @@ export DIRS = "crypto ssl apps"
export EX_LIBS = "-lgcc -ldl"
export AS = "${CC} -c"
-inherit pkgconfig siteinfo
+inherit pkgconfig siteinfo multilib_header
PACKAGES =+ "libcrypto libssl ${PN}-misc"
FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
@@ -145,6 +145,7 @@ do_install () {
cp --dereference -R include/openssl ${D}${includedir}
sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
+ oe_multilib_header openssl/opensslconf.h
}
BBCLASSEXTEND = "native nativesdk"
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] openssl: Fix multilib header conflict - opensslconf.h
2013-07-17 5:15 [PATCH] openssl: Fix multilib header conflict - opensslconf.h Ming Liu
@ 2013-07-26 18:10 ` Saul Wold
2013-07-29 1:20 ` Ming Liu
0 siblings, 1 reply; 3+ messages in thread
From: Saul Wold @ 2013-07-26 18:10 UTC (permalink / raw)
To: Ming Liu; +Cc: openembedded-core
On 07/16/2013 10:15 PM, Ming Liu wrote:
> opensslconf.h conflicts between 32-bit and 64-bit versions.
>
> Signed-off-by: Ming Liu <ming.liu@windriver.com>
> ---
> meta/recipes-connectivity/openssl/openssl.inc | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index f5b2432..267eb89 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -5,7 +5,7 @@ BUGTRACKER = "http://www.openssl.org/news/vulnerabilities.html"
> SECTION = "libs/network"
>
> # Big Jump for OpenSSL 1.0 support with meta-oe
> -INC_PR = "r15"
> +INC_PR = "r16"
>
No PR Bump needed
Sorry I missed this patch.
Sau!
> # "openssl | SSLeay" dual license
> LICENSE = "openssl"
> @@ -31,7 +31,7 @@ export DIRS = "crypto ssl apps"
> export EX_LIBS = "-lgcc -ldl"
> export AS = "${CC} -c"
>
> -inherit pkgconfig siteinfo
> +inherit pkgconfig siteinfo multilib_header
>
> PACKAGES =+ "libcrypto libssl ${PN}-misc"
> FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
> @@ -145,6 +145,7 @@ do_install () {
> cp --dereference -R include/openssl ${D}${includedir}
> sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
>
> + oe_multilib_header openssl/opensslconf.h
> }
>
> BBCLASSEXTEND = "native nativesdk"
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] openssl: Fix multilib header conflict - opensslconf.h
2013-07-26 18:10 ` Saul Wold
@ 2013-07-29 1:20 ` Ming Liu
0 siblings, 0 replies; 3+ messages in thread
From: Ming Liu @ 2013-07-29 1:20 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On 07/27/2013 02:10 AM, Saul Wold wrote:
> On 07/16/2013 10:15 PM, Ming Liu wrote:
>> opensslconf.h conflicts between 32-bit and 64-bit versions.
>>
>> Signed-off-by: Ming Liu <ming.liu@windriver.com>
>> ---
>> meta/recipes-connectivity/openssl/openssl.inc | 5 +++--
>> 1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/openssl/openssl.inc
>> b/meta/recipes-connectivity/openssl/openssl.inc
>> index f5b2432..267eb89 100644
>> --- a/meta/recipes-connectivity/openssl/openssl.inc
>> +++ b/meta/recipes-connectivity/openssl/openssl.inc
>> @@ -5,7 +5,7 @@ BUGTRACKER =
>> "http://www.openssl.org/news/vulnerabilities.html"
>> SECTION = "libs/network"
>>
>> # Big Jump for OpenSSL 1.0 support with meta-oe
>> -INC_PR = "r15"
>> +INC_PR = "r16"
>>
> No PR Bump needed
>
Got it, I will send the V1.
> Sorry I missed this patch.
That doesn't matter.
the best,
thank you
>
> Sau!
>
>> # "openssl | SSLeay" dual license
>> LICENSE = "openssl"
>> @@ -31,7 +31,7 @@ export DIRS = "crypto ssl apps"
>> export EX_LIBS = "-lgcc -ldl"
>> export AS = "${CC} -c"
>>
>> -inherit pkgconfig siteinfo
>> +inherit pkgconfig siteinfo multilib_header
>>
>> PACKAGES =+ "libcrypto libssl ${PN}-misc"
>> FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
>> @@ -145,6 +145,7 @@ do_install () {
>> cp --dereference -R include/openssl ${D}${includedir}
>> sed -i -e '1s,.*,#!${bindir}/env perl,'
>> ${D}${libdir}/ssl/misc/CA.pl
>>
>> + oe_multilib_header openssl/opensslconf.h
>> }
>>
>> BBCLASSEXTEND = "native nativesdk"
>>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-29 1:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-17 5:15 [PATCH] openssl: Fix multilib header conflict - opensslconf.h Ming Liu
2013-07-26 18:10 ` Saul Wold
2013-07-29 1:20 ` Ming Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.