[V2,07/10] x264: Fix build on mips architectures

Message ID 20161219063957.18716-7-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj Dec. 19, 2016, 6:39 a.m.
Disable asm to fix

| You specified a pre-MSA CPU in your CFLAGS.
| If you really want to run on such a CPU, configure with --disable-asm.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta/recipes-multimedia/x264/x264_git.bb | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

André Draszik Dec. 19, 2016, 10:33 a.m. | #1
On Sun, 2016-12-18 at 22:39 -0800, Khem Raj wrote:
> Disable asm to fix
> 
> > You specified a pre-MSA CPU in your CFLAGS.
> > If you really want to run on such a CPU, configure with --disable-asm.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-multimedia/x264/x264_git.bb | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-
> multimedia/x264/x264_git.bb
> index e790681ad3..240a19661f 100644
> --- a/meta/recipes-multimedia/x264/x264_git.bb
> +++ b/meta/recipes-multimedia/x264/x264_git.bb
> @@ -23,6 +23,8 @@ inherit lib_package pkgconfig perlnative
>  X264_DISABLE_ASM = ""
>  X264_DISABLE_ASM_armv4 = "--disable-asm"
>  X264_DISABLE_ASM_armv5 = "--disable-asm"
> +X264_DISABLE_ASM_mips = "--disable-asm"
> +X264_DISABLE_ASM_mipsel = "--disable-asm"

I think you can use _mipsarch these days, which covers all MIPS. Equally,
mips32r5 and later have MSA, so I think the override should be:

X264_DISABLE_ASM_mipsarch = "--disable-asm"
X264_DISABLE_ASM_mipsarchr6 = ""

or just

X264_DISABLE_ASM_mipsarch = "${@bb.utils.contains("AVAILTUNES", "mips32r6",
"", "--disable-asm", d)}"

not sure, and completely untested.

Cheers,
Andre'
André Draszik Dec. 19, 2016, 10:40 a.m. | #2
On Mon, 2016-12-19 at 10:33 +0000, André Draszik wrote:
> On Sun, 2016-12-18 at 22:39 -0800, Khem Raj wrote:
> > Disable asm to fix
> > 
> > > You specified a pre-MSA CPU in your CFLAGS.
> > > If you really want to run on such a CPU, configure with --disable-asm.
> > 
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta/recipes-multimedia/x264/x264_git.bb | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-
> > multimedia/x264/x264_git.bb
> > index e790681ad3..240a19661f 100644
> > --- a/meta/recipes-multimedia/x264/x264_git.bb
> > +++ b/meta/recipes-multimedia/x264/x264_git.bb
> > @@ -23,6 +23,8 @@ inherit lib_package pkgconfig perlnative
> >  X264_DISABLE_ASM = ""
> >  X264_DISABLE_ASM_armv4 = "--disable-asm"
> >  X264_DISABLE_ASM_armv5 = "--disable-asm"
> > +X264_DISABLE_ASM_mips = "--disable-asm"
> > +X264_DISABLE_ASM_mipsel = "--disable-asm"
> 
> I think you can use _mipsarch these days, which covers all MIPS. Equally,
> mips32r5 and later have MSA, so I think the override should be:
> 
> X264_DISABLE_ASM_mipsarch = "--disable-asm"
> X264_DISABLE_ASM_mipsarchr6 = ""
> 
> or just
> 
> X264_DISABLE_ASM_mipsarch = "${@bb.utils.contains("AVAILTUNES", "mips32r6", "", "--disable-asm", d)}"

or

X264_DISABLE_ASM_mipsarch = "${@bb.utils.contains("TUNE_FEATURES", "r6", "", "--disable-asm", d)}"


> not sure, and completely untested.

A.
Khem Raj Dec. 19, 2016, 4:43 p.m. | #3
On Mon, Dec 19, 2016 at 2:40 AM, André Draszik <git@andred.net> wrote:
> On Mon, 2016-12-19 at 10:33 +0000, André Draszik wrote:
>> On Sun, 2016-12-18 at 22:39 -0800, Khem Raj wrote:
>> > Disable asm to fix
>> >
>> > > You specified a pre-MSA CPU in your CFLAGS.
>> > > If you really want to run on such a CPU, configure with --disable-asm.
>> >
>> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> > ---
>> >  meta/recipes-multimedia/x264/x264_git.bb | 2 ++
>> >  1 file changed, 2 insertions(+)
>> >
>> > diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-
>> > multimedia/x264/x264_git.bb
>> > index e790681ad3..240a19661f 100644
>> > --- a/meta/recipes-multimedia/x264/x264_git.bb
>> > +++ b/meta/recipes-multimedia/x264/x264_git.bb
>> > @@ -23,6 +23,8 @@ inherit lib_package pkgconfig perlnative
>> >  X264_DISABLE_ASM = ""
>> >  X264_DISABLE_ASM_armv4 = "--disable-asm"
>> >  X264_DISABLE_ASM_armv5 = "--disable-asm"
>> > +X264_DISABLE_ASM_mips = "--disable-asm"
>> > +X264_DISABLE_ASM_mipsel = "--disable-asm"
>>
>> I think you can use _mipsarch these days, which covers all MIPS. Equally,
>> mips32r5 and later have MSA, so I think the override should be:
>>
>> X264_DISABLE_ASM_mipsarch = "--disable-asm"
>> X264_DISABLE_ASM_mipsarchr6 = ""
>>
>> or just
>>
>> X264_DISABLE_ASM_mipsarch = "${@bb.utils.contains("AVAILTUNES", "mips32r6", "", "--disable-asm", d)}"
>
> or
>
> X264_DISABLE_ASM_mipsarch = "${@bb.utils.contains("TUNE_FEATURES", "r6", "", "--disable-asm", d)}"
>
>

Yeah using misparch is right approach here.

>> not sure, and completely untested.
>
> A.
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch hide | download patch | download mbox

diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index e790681ad3..240a19661f 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -23,6 +23,8 @@  inherit lib_package pkgconfig perlnative
 X264_DISABLE_ASM = ""
 X264_DISABLE_ASM_armv4 = "--disable-asm"
 X264_DISABLE_ASM_armv5 = "--disable-asm"
+X264_DISABLE_ASM_mips = "--disable-asm"
+X264_DISABLE_ASM_mipsel = "--disable-asm"
 X264_DISABLE_ASM_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "spe", "--disable-asm", "", d)}"
 
 EXTRA_OECONF = '--prefix=${prefix} \