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" | |||
138 | python autotools_copy_aclocals () { | 138 | python 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 | |||
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 |