diff options
| -rw-r--r-- | meta/classes/autotools.bbclass | 3 | ||||
| -rw-r--r-- | 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 01e49c98bf..b645996136 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 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 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 |