summaryrefslogtreecommitdiffstats
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-10 16:45:50 +0100
commit33fa8e2a78901fe71638759eb6d6d1a57cfc9223 (patch)
tree5ef93629f201b459e48834023cd8097067984e55
parent3d79617742628525f86fe3a1f123a903cfde13d9 (diff)
downloadpoky-33fa8e2a78901fe71638759eb6d6d1a57cfc9223.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 master rev: dea66ade1184cef6aeb242d87867759ca44a8895) (From OE-Core rev: 1f3b3c75701b791cb32aba76f0a4448f5549fae3) 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>
-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"