[oe] Koen Kooi : speex: make float and asm settings more intelligent

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 24-09-10 20:13, Martin Jansa wrote:
> On Fri, Sep 24, 2010 at 5:22 PM, git version control
> <git at git.openembedded.org> wrote:
>> Module: openembedded.git
>> Branch: org.openembedded.dev
>> Commit: e06553979d23531397af3dd71870abb80718c681
>> URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e06553979d23531397af3dd71870abb80718c681
>>
>> Author: Koen Kooi <koen at openembedded.org>
>> Date:   Fri Sep 24 17:20:54 2010 +0200
>>
>> speex: make float and asm settings more intelligent
>>
>> ---
>>
>>  recipes/speex/speex-fpu.inc |    5 +++++
>>  recipes/speex/speex_1.2.bb  |   14 ++++++++------
>>  2 files changed, 13 insertions(+), 6 deletions(-)
>>
>> diff --git a/recipes/speex/speex-fpu.inc b/recipes/speex/speex-fpu.inc
>> new file mode 100644
>> index 0000000..4c63920
>> --- /dev/null
>> +++ b/recipes/speex/speex-fpu.inc
>> @@ -0,0 +1,5 @@
>> +def get_speex_fpu_setting(bb, d):
>> +       if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
>> +               return "--enable-fixed-point --disable-float-api --disable-vbr"
>> +       return ""
>> +
>> diff --git a/recipes/speex/speex_1.2.bb b/recipes/speex/speex_1.2.bb
>> index f498731..049b472 100644
>> --- a/recipes/speex/speex_1.2.bb
>> +++ b/recipes/speex/speex_1.2.bb
>> @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.speex.org"
>>  DEPENDS = "libogg"
>>  BETA = "1.2rc1"
>>  PV = "1.1+${BETA}"
>> -PR = "r0"
>> +PR = "r1"
>>
>>  SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${BETA}.tar.gz"
>>  S = "${WORKDIR}/speex-${BETA}"
>> @@ -25,13 +25,15 @@ LEAD_SONAME = "libspeex.so"
>>  #       --disable-float-api --disable-vbr (must disable-vbr if disable-float-api)
>>  #
>>
>> -EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point --disable-float-api --disable-vbr "
>> -EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --disable-vbr "
>> -EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --disable-vbr "
>> -EXTRA_OECONF_append_arm = " --enable-fixed-point --disable-float-api --disable-vbr "
>> -EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point --disable-float-api --disable-vbr "
>> +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
>> +require speex-fpu.inc
>> +EXTRA_OECONF += "${@get_speex_fpu_setting(bb, d)}"
>>
>> +ARMASM_armv4t = "--enable-arm4-asm"
> 
> Hi,
> 
> for some reason it fails on armv4t (om-gta02) with --enable-arm4-asm
> 
> http://tinderbox.openembedded.net/packages/779499/
> 
>> +ARMASM_armv5te = "--enable-arm5e-asm"
> 
> and this breaks armv5te (spitz)
> 
> http://tinderbox.openembedded.net/packages/779550/
> 
> pity :/

I turned it off till we figure out how to make it work for everyone.
Thanks for the report!

regards,

Koen



> 
> Regards,
>> +ARMASM ?= ""
>>
>> +EXTRA_OECONF += "${ARMASM}"
>>
>>  do_configure_append() {
>>        sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
>>
>>
>> _______________________________________________
>> Openembedded-commits mailing list
>> Openembedded-commits at lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
>>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFMnP4+MkyGM64RGpERAimyAJsELGVtbyyiPW75+YoyEMgGW2gH1wCeKOOZ
UCBYQq1GmQNs7rGB0286NQM=
=gZxy
-----END PGP SIGNATURE-----