diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2017-02-15 09:13:02 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-23 12:49:52 -0800 |
| commit | 06fe5024e283a105358259b751a5cbc5e33f5c77 (patch) | |
| tree | 4f1ea815457006db6a0b4b6d43389e3bffc90ce8 | |
| parent | 5286f9c310eaaaf762b8d091ec6ae7b83d0417d8 (diff) | |
| download | poky-06fe5024e283a105358259b751a5cbc5e33f5c77.tar.gz | |
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.
(From OE-Core rev: 1ed6f860de22321342404a49ba78658153ff5eb8)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-fpu.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.1.3.bb | 2 |
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 1ca31e7498..355a9dfcd1 100644 --- a/meta/recipes-multimedia/alsa/alsa-fpu.inc +++ b/meta/recipes-multimedia/alsa/alsa-fpu.inc | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | |||
| 2 | def get_alsa_fpu_setting(bb, d): | 1 | def get_alsa_fpu_setting(bb, d): |
| 3 | if d.getVar('TARGET_FPU') in [ 'soft' ]: | 2 | if d.getVar('TARGET_FPU') in [ 'soft' ]: |
| 4 | return "--with-softfloat" | 3 | return "--with-softfloat" |
| 5 | return "" | 4 | return "" |
| 6 | |||
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 5c213bebde..34a7d8802e 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 | |||
| 21 | require alsa-fpu.inc | 21 | require alsa-fpu.inc |
| 22 | EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " | 22 | EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " |
| 23 | 23 | ||
| 24 | EXTRA_OECONF = "--disable-python" | 24 | EXTRA_OECONF += "--disable-python" |
| 25 | 25 | ||
| 26 | EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " | 26 | EXTRA_OECONF_append_libc-uclibc = " --with-versioned=no " |
| 27 | 27 | ||
