diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-03 15:49:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-05 15:50:19 +0000 |
commit | 12d613f9a9566cc4bf2555970d4eae8ba3868c36 (patch) | |
tree | cf5f1ee842c21043509743982d7d4f9e5727cab7 /meta/recipes-multimedia/alsa | |
parent | b924b499ecd28bb433a12fb327f0e63d66db97b5 (diff) | |
download | poky-12d613f9a9566cc4bf2555970d4eae8ba3868c36.tar.gz |
alsa-tools/autotools: Ensure that aclocal files can be present with AUTOTOOLS_COPYACLOCAL variable
Introduce a AUTOTOOLS_COPYACLOCAL variable which forces the copy of the aclocal
files even when a configure.ac/.in file isn't present.
Use this new feature in alsa-tools.
(From OE-Core rev: 07db5222a970e40bff51c5df793f0021b0e2aba8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb | 6 |
1 files changed, 2 insertions, 4 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 6321b786fc..b1542332de 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 | |||
@@ -25,10 +25,8 @@ EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --targ | |||
25 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" | 25 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" |
26 | PACKAGECONFIG[gtk+] = ",,gtk+," | 26 | PACKAGECONFIG[gtk+] = ",,gtk+," |
27 | 27 | ||
28 | do_configure () { | 28 | # configure.ac/.in doesn't exist so force copy |
29 | autotools_do_configure | 29 | AUTOTOOLS_COPYACLOCAL = "1" |
30 | autotools_copy_aclocal | ||
31 | } | ||
32 | 30 | ||
33 | do_compile_prepend () { | 31 | do_compile_prepend () { |
34 | #Automake dir is not correctly detected in cross compilation case | 32 | #Automake dir is not correctly detected in cross compilation case |