mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Richard Purdie
2014-03-03 15:49:50 +00:00
parent b924b499ec
commit 12d613f9a9
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/classes/autotools.bbclass
View File

@@ -138,7 +138,8 @@ ACLOCALDIR = "${B}/aclocal-copy"
python autotools_copy_aclocals () { python autotools_copy_aclocals () {
s = d.getVar("S", True) s = d.getVar("S", True)
if not os.path.exists(s + "/configure.in") and not os.path.exists(s + "/configure.ac"): 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) taskdepdata = d.getVar("BB_TASKDEPDATA", False)
pn = d.getVar("PN", True) pn = d.getVar("PN", True)

6
meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
View File

@@ -25,10 +25,8 @@ EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --targ
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
PACKAGECONFIG[gtk+] = ",,gtk+," PACKAGECONFIG[gtk+] = ",,gtk+,"
do_configure () { # configure.ac/.in doesn't exist so force copy
autotools_do_configure AUTOTOOLS_COPYACLOCAL = "1"
autotools_copy_aclocal
}
do_compile_prepend () { do_compile_prepend () {
#Automake dir is not correctly detected in cross compilation case #Automake dir is not correctly detected in cross compilation case