summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-31 14:07:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-04 11:50:24 +0100
commit158d9d82e0880aca33bfd3312376835ff75735c1 (patch)
tree282eb7c2b4ba9817a1df0383a1cb6e54605ee9b1 /meta/recipes-multimedia
parent1808552a86c83b53e7f3fa7d88890f661bb98264 (diff)
downloadpoky-158d9d82e0880aca33bfd3312376835ff75735c1.tar.gz
alsa-tools: Fix configure race
aclocal is being called here directly, not called by autotools.bbclass wrapper. aclocal files are installed in sysroot, and are removed while build is still running. This translates to a possible race condition during the build. Fixes [YOCTO #4358]. (From OE-Core rev: dea66ade1184cef6aeb242d87867759ca44a8895) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
index 81ad55acd3..24af545054 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
@@ -20,14 +20,20 @@ SRC_URI[sha256sum] = "553338693707fe6ddfc430b9edc4cd2677390e200c9e38de82ede3394e
20 20
21inherit autotools 21inherit autotools
22 22
23EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'" 23EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'"
24 24
25PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" 25PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
26PACKAGECONFIG[gtk+] = ",,gtk+," 26PACKAGECONFIG[gtk+] = ",,gtk+,"
27 27
28do_configure () {
29 autotools_do_configure
30 autotools_copy_aclocal
31}
32
28do_compile_prepend () { 33do_compile_prepend () {
29 #Automake dir is not correctly detected in cross compilation case 34 #Automake dir is not correctly detected in cross compilation case
30 export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake) 35 export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake)
36 export ACLOCAL="aclocal --system-acdir=${ACLOCALDIR}/"
31} 37}
32 38
33FILES_${PN} += "${datadir}/ld10k1" 39FILES_${PN} += "${datadir}/ld10k1"