[PATCH] openssl: fix mips64 configure support

[PATCH] openssl: fix mips64 configure support

[wenzong.fan]

From: Wenzong Fan <wenzong.fan@windriver.com>

Match target name linux-mips64 as well, all mips64 targets will have
mips(32) userspace.

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
 meta/recipes-connectivity/openssl/openssl.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 8af423f..b69cb4c 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -115,7 +115,7 @@ do_configure () {
 	linux-mipsel)
 		target=debian-mipsel
 		;;
-        linux-*-mips64)
+        linux-*-mips64 | linux-mips64)
                target=linux-mips
                 ;;
 	linux-microblaze*|linux-nios2*)
-- 
1.9.1

Re: [PATCH] openssl: fix mips64 configure support

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]


> On Nov 4, 2015, at 10:09 PM, wenzong.fan@windriver.com wrote:
> 
> From: Wenzong Fan <wenzong.fan@windriver.com>
> 
> Match target name linux-mips64 as well, all mips64 targets will have
> mips(32) userspace.

this comment seems to be not relevant to the change

> 
> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
> ---
> meta/recipes-connectivity/openssl/openssl.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
> index 8af423f..b69cb4c 100644
> --- a/meta/recipes-connectivity/openssl/openssl.inc
> +++ b/meta/recipes-connectivity/openssl/openssl.inc
> @@ -115,7 +115,7 @@ do_configure () {
> 	linux-mipsel)
> 		target=debian-mipsel
> 		;;
> -        linux-*-mips64)
> +        linux-*-mips64 | linux-mips64)
>                target=linux-mips
>                 ;;
> 	linux-microblaze*|linux-nios2*)
> --
> 1.9.1
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH] openssl: fix mips64 configure support

[wenzong fan]

On 11/06/2015 12:18 AM, Khem Raj wrote:
>
>> On Nov 4, 2015, at 10:09 PM, wenzong.fan@windriver.com wrote:
>>
>> From: Wenzong Fan <wenzong.fan@windriver.com>
>>
>> Match target name linux-mips64 as well, all mips64 targets will have
>> mips(32) userspace.
>
> this comment seems to be not relevant to the change
>

What about:

If target name is linux-mips64, set it as linux-mips to get it build 
with mips(32) userspace.

Thanks
Wenzong

>>
>> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
>> ---
>> meta/recipes-connectivity/openssl/openssl.inc | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
>> index 8af423f..b69cb4c 100644
>> --- a/meta/recipes-connectivity/openssl/openssl.inc
>> +++ b/meta/recipes-connectivity/openssl/openssl.inc
>> @@ -115,7 +115,7 @@ do_configure () {
>> 	linux-mipsel)
>> 		target=debian-mipsel
>> 		;;
>> -        linux-*-mips64)
>> +        linux-*-mips64 | linux-mips64)
>>                 target=linux-mips
>>                  ;;
>> 	linux-microblaze*|linux-nios2*)
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

Re: [PATCH] openssl: fix mips64 configure support

[Khem Raj]

On Fri, Nov 6, 2015 at 11:07 PM, wenzong fan <wenzong.fan@windriver.com> wrote:
> If target name is linux-mips64, set it as linux-mips to get it build with
> mips(32) userspace.

is it really building for mips32 ?

Re: [PATCH] openssl: fix mips64 configure support

[wenzong fan]

On 11/07/2015 03:09 PM, Khem Raj wrote:
> On Fri, Nov 6, 2015 at 11:07 PM, wenzong fan <wenzong.fan@windriver.com> wrote:
>> If target name is linux-mips64, set it as linux-mips to get it build with
>> mips(32) userspace.
>
> is it really building for mips32 ?
>
>

Yes, with this change, the "Configure" will pass '-mips2' to CFLAGS, 
otherwise it will pass '-mips3' which may cause build errors:

| Error: -mips3 conflicts with the other architecture options, which 
imply -mips64r2
| cryptlib.c:1:0: error: '-mips3' conflicts with the other architecture 
options, which specify a mips64r2 processor

I built it with a cav-octeon3 bsp.

Looks openssl doesn't work with mips64 userspace, I got this from git logs:

commit 858646c7bd11d1dad8c14e30f3fe6b4bd58a31b2
Author: Randy MacLeod <Randy.MacLeod@windriver.com>
Date:   Fri Dec 21 14:05:46 2012 -0500

     openssl: Add mips64 configure support.

     Add mips64 configure support but assume mips(32) userspace.

     (From OE-Core rev: 7d775b071b902ee0de6391b2c30d36e3003643e1)

     Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
     Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
     Signed-off-by: Saul Wold <sgw@linux.intel.com>
     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/openssl/openssl.inc 
b/meta/recipes-connectivity/openssl/openssl.inc
index e1e7b65..af1922e 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -95,6 +95,9 @@ do_configure () {
         linux-mipsel)
                 target=debian-mipsel
                 ;;
+        linux-*-mips64)
+               target=linux-mips
+                ;;
         linux-powerpc)
                 target=linux-ppc
                 ;;

Thanks
Wenzong