[PATCH v1] libmad: avoid using legacy _thumb overrides

[PATCH v1] libmad: avoid using legacy _thumb overrides

[Ming Liu]

From: Peter Liu <peter.x.liu@external.atlascopco.com>

_thumb had been dropped from overrides since commit 351443d7:
[ feature-arm-thumb.inc: drop legacy _thumb and _thumb-interwork over-rides ]

Change to set EXTRA_OECONF_append by checking ARM_INSTRUCTION_SET instead.

[YOCTO #9323]

Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
---
 meta/recipes-multimedia/libmad/libmad_0.15.1b.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
index 9e08b16..4c15db2 100644
--- a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
+++ b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
@@ -27,7 +27,7 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "-enable-speed --enable-shared"
 # The ASO's don't take any account of thumb...
-EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
+EXTRA_OECONF_append = " ${@['', '--disable-aso --enable-fpm=default'][d.getVar('ARM_INSTRUCTION_SET', True) == 'thumb']}"
 EXTRA_OECONF_append_arm = " --enable-fpm=arm"
 
 do_configure_prepend () {
-- 
1.9.1

Re: [PATCH v1] libmad: avoid using legacy _thumb overrides

[Martin Jansa]

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

On Wed, Mar 23, 2016 at 03:19:58PM +0100, Ming Liu wrote:
> From: Peter Liu <peter.x.liu@external.atlascopco.com>
> 
> _thumb had been dropped from overrides since commit 351443d7:
> [ feature-arm-thumb.inc: drop legacy _thumb and _thumb-interwork over-rides ]
> 
> Change to set EXTRA_OECONF_append by checking ARM_INSTRUCTION_SET instead.

This also isn't right, ARM_INSTRUCTION_SET can be set to "thumb" even
when MACHINE doesn't support it by having "thumb" in TUNE_FEATURES.

You'll need to replicate the conditionals which were used in the tune
files or just revert that cleanup if you find "thumb" override still
useful.

> [YOCTO #9323]
> 
> Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
> ---
>  meta/recipes-multimedia/libmad/libmad_0.15.1b.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
> index 9e08b16..4c15db2 100644
> --- a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
> +++ b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
> @@ -27,7 +27,7 @@ inherit autotools pkgconfig
>  
>  EXTRA_OECONF = "-enable-speed --enable-shared"
>  # The ASO's don't take any account of thumb...
> -EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
> +EXTRA_OECONF_append = " ${@['', '--disable-aso --enable-fpm=default'][d.getVar('ARM_INSTRUCTION_SET', True) == 'thumb']}"
>  EXTRA_OECONF_append_arm = " --enable-fpm=arm"
>  
>  do_configure_prepend () {
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH v1] libmad: avoid using legacy _thumb overrides

[Martin Jansa]

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

On Thu, Mar 24, 2016 at 02:38:04PM +0000, Peter Liu wrote:
> 
> 
> ________________________________________
> From: Martin Jansa <martin.jansa@gmail.com>
> Sent: Wednesday, March 23, 2016 3:41 PM
> To: Ming Liu
> Cc: openembedded-core@lists.openembedded.org; yue.tao@windriver.com; Peter Liu
> Subject: Re: [OE-core] [PATCH v1] libmad: avoid using legacy _thumb overrides
> 
> On Wed, Mar 23, 2016 at 03:19:58PM +0100, Ming Liu wrote:
> >> From: Peter Liu <peter.x.liu@external.atlascopco.com>
> >>
> >> _thumb had been dropped from overrides since commit 351443d7:
> >> [ feature-arm-thumb.inc: drop legacy _thumb and _thumb-interwork over-rides ]
> >>
> >> Change to set EXTRA_OECONF_append by checking ARM_INSTRUCTION_SET instead.
> > 
> > This also isn't right, ARM_INSTRUCTION_SET can be set to "thumb" even
> > when MACHINE doesn't support it by having "thumb" in TUNE_FEATURES.
> 
> OK, thanks for the correction.
> 
> > 
> > You'll need to replicate the conditionals which were used in the tune
> > files or just revert that cleanup if you find "thumb" override still
> > useful.
> 
> Yes, then maybe reverting that commit could be a better fix considering that there is not a easy way for end users to override the thumb related settings. I will send a V2 soon.

Andre already sent patch to remove this EXTRA_OECONF override completely.

If you think that it's still needed for whatever reason you should reply
on his patch.

> 
> //Ming Liu 
> 
> > 
> >> [YOCTO #9323]
> >>
> >> Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
> >> ---
> >>  meta/recipes-multimedia/libmad/libmad_0.15.1b.bb | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
> >> index 9e08b16..4c15db2 100644
> >> --- a/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
> >> +++ b/meta/recipes-multimedia/libmad/libmad_0.15.1b.bb
> >> @@ -27,7 +27,7 @@ inherit autotools pkgconfig
> >>
> >>  EXTRA_OECONF = "-enable-speed --enable-shared"
> >>  # The ASO's don't take any account of thumb...
> >> -EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
> >> +EXTRA_OECONF_append = " ${@['', '--disable-aso --enable-fpm=default'][d.getVar('ARM_INSTRUCTION_SET', True) == 'thumb']}"
> >>  EXTRA_OECONF_append_arm = " --enable-fpm=arm"
> >>
> >>  do_configure_prepend () {
> >> --
> >> 1.9.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]