alsa-tools/autotools: Ensure that aclocal files can be present with AUTOTOOLS_COPYACLOCAL variable

PATCH New Richard Purdie 1 participant 1 message Mar 3, 2014

Share & tools

Richard Purdie

author

2014-03-03 15:50 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

meta/classes/autotools.bbclass +2 -1

index 70a521d..15fcfc6 100644
@@ -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)

meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb +2 -4

index 6321b78..b154233 100644
@@ -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