Patchwork openssl: Fix multilib header conflict - opensslconf.h

login
register
mail settings
Submitter Ming Liu
Date July 17, 2013, 5:15 a.m.
Message ID <1374038143-5807-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/53799/
State New
Headers show

Comments

Ming Liu - July 17, 2013, 5:15 a.m.
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(-)
Saul Wold - July 26, 2013, 6:10 p.m.
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"
>
Ming Liu - July 29, 2013, 1:20 a.m.
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"
>>
>
>

Patch

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"