aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2017-02-15 09:13:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:29:19 -0800
commit1ed6f860de22321342404a49ba78658153ff5eb8 (patch)
tree0a49813d0aabbdde85a565734c97c5e7ecf06f5a
parentdc549b5510bfcf83f6e5e8e3aa7ed663dee83444 (diff)
downloadopenembedded-core-contrib-1ed6f860de22321342404a49ba78658153ff5eb8.tar.gz
openembedded-core-contrib-1ed6f860de22321342404a49ba78658153ff5eb8.tar.bz2
openembedded-core-contrib-1ed6f860de22321342404a49ba78658153ff5eb8.zip
alsa-lib: fix softfloat enabling
EXTRA_OECONF = "--disable-python" overrode the previous EXTRA_OECONF assignment, so softfloat didn't get enabled when needed. Fixed this by replacing "=" with "+=". Bitbake then complained about tabs in alsa-fpu.inc, changed them to spaces. Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-fpu.inc8
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb2
2 files changed, 4 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-fpu.inc b/meta/recipes-multimedia/alsa/alsa-fpu.inc
index 1ca31e74981..355a9dfcd10 100644
--- a/meta/recipes-multimedia/alsa/alsa-fpu.inc
+++ b/meta/recipes-multimedia/alsa/alsa-fpu.inc
@@ -1,6 +1,4 @@
-
def get_alsa_fpu_setting(bb, d):
- if d.getVar('TARGET_FPU') in [ 'soft' ]:
- return "--with-softfloat"
- return ""
-
+ if d.getVar('TARGET_FPU') in [ 'soft' ]:
+ return "--with-softfloat"
+ return ""
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
index 5c213bebde1..34a7d8802ef 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb
@@ -21,7 +21,7 @@ inherit autotools pkgconfig
require alsa-fpu.inc
EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
-EXTRA_OECONF = "--disable-python"
+EXTRA_OECONF += "--disable-python"
EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no "