summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-03 15:49:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-05 15:50:19 +0000
commit12d613f9a9566cc4bf2555970d4eae8ba3868c36 (patch)
treecf5f1ee842c21043509743982d7d4f9e5727cab7
parentb924b499ecd28bb433a12fb327f0e63d66db97b5 (diff)
downloadpoky-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>
-rw-r--r--meta/classes/autotools.bbclass3
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb6
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 01e49c98bf..b645996136 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -138,7 +138,8 @@ ACLOCALDIR = "${B}/aclocal-copy"
138python autotools_copy_aclocals () { 138python autotools_copy_aclocals () {
139 s = d.getVar("S", True) 139 s = d.getVar("S", True)
140 if not os.path.exists(s + "/configure.in") and not os.path.exists(s + "/configure.ac"): 140 if not os.path.exists(s + "/configure.in") and not os.path.exists(s + "/configure.ac"):
141 return 141 if not d.getVar("AUTOTOOLS_COPYACLOCAL"):
142 return
142 143
143 taskdepdata = d.getVar("BB_TASKDEPDATA", False) 144 taskdepdata = d.getVar("BB_TASKDEPDATA", False)
144 pn = d.getVar("PN", True) 145 pn = d.getVar("PN", True)
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
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 () { 28# configure.ac/.in doesn't exist so force copy
29 autotools_do_configure 29AUTOTOOLS_COPYACLOCAL = "1"
30 autotools_copy_aclocal
31}
32 30
33do_compile_prepend () { 31do_compile_prepend () {
34 #Automake dir is not correctly detected in cross compilation case 32 #Automake dir is not correctly detected in cross compilation case