[oe-commits] Richard Purdie : alsa-tools/autotools: Ensure that aclocal files can be present with AUTOTOOLS_COPYACLOCAL variable
git at git.openembedded.org
git at git.openembedded.org
Mon Mar 3 15:49:00 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: ea0130f1060b7456c4b30f581daf89e5041550a5
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ea0130f1060b7456c4b30f581daf89e5041550a5
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Mon Mar 3 15:49:50 2014 +0000
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/autotools.bbclass | 3 ++-
meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb | 6 ++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 70a521d..15fcfc6 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -138,7 +138,8 @@ ACLOCALDIR = "${B}/aclocal-copy"
python autotools_copy_aclocals () {
s = d.getVar("S", True)
if not os.path.exists(s + "/configure.in") and not os.path.exists(s + "/configure.ac"):
- return
+ if not d.getVar("AUTOTOOLS_COPYACLOCAL"):
+ return
taskdepdata = d.getVar("BB_TASKDEPDATA", False)
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 6321b78..b154233 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
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
PACKAGECONFIG[gtk+] = ",,gtk+,"
-do_configure () {
- autotools_do_configure
- autotools_copy_aclocal
-}
+# configure.ac/.in doesn't exist so force copy
+AUTOTOOLS_COPYACLOCAL = "1"
do_compile_prepend () {
#Automake dir is not correctly detected in cross compilation case
More information about the Openembedded-commits
mailing list