diff options
| author |   Koen Kooi <koen@openembedded.org> | 2010-09-24 17:20:54 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-09-24 17:22:22 +0200 |
| commit | e06553979d23531397af3dd71870abb80718c681 (patch) | |
| tree | be8ccaa9ed02b6c0060be6c4835d4efb0b34f5ca | |
| parent | 2aa46c0ad9f08636fb8c471b7e41826e957646c9 (diff) | |
| download | openembedded-e06553979d23531397af3dd71870abb80718c681.tar.gz | |
speex: make float and asm settings more intelligent
| -rw-r--r-- | recipes/speex/speex-fpu.inc | 5 | ||||
| -rw-r--r-- | 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 0000000000..4c639200b3 --- /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 f498731b32..049b472482 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" +ARMASM_armv5te = "--enable-arm5e-asm" +ARMASM ?= "" +EXTRA_OECONF += "${ARMASM}" do_configure_append() { sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile |