diff options
Diffstat (limited to 'meta/classes/autotools.bbclass')
-rw-r--r-- | meta/classes/autotools.bbclass | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 9dc8ebdaa7..4ab2460990 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -1,4 +1,4 @@ -def autotools_dep_prepend(d): +def get_autotools_dep(d): if d.getVar('INHIBIT_AUTOTOOLS_DEPS'): return '' @@ -19,7 +19,8 @@ def autotools_dep_prepend(d): return deps -DEPENDS_prepend = "${@autotools_dep_prepend(d)} " + +DEPENDS:prepend = "${@get_autotools_dep(d)} " inherit siteinfo @@ -131,7 +132,7 @@ autotools_postconfigure(){ EXTRACONFFUNCS ??= "" -EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" +EXTRA_OECONF:append = " ${PACKAGECONFIG_CONFARGS}" do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}" do_compile[prefuncs] += "autotools_aclocals" @@ -140,13 +141,16 @@ do_configure[postfuncs] += "autotools_postconfigure" ACLOCALDIR = "${STAGING_DATADIR}/aclocal" ACLOCALEXTRAPATH = "" -ACLOCALEXTRAPATH_class-target = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" -ACLOCALEXTRAPATH_class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" +ACLOCALEXTRAPATH:class-target = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" +ACLOCALEXTRAPATH:class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" python autotools_aclocals () { - d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True)) + sitefiles, searched = siteinfo_get_files(d, sysrootcache=True) + d.setVar("CONFIG_SITE", " ".join(sitefiles)) } +do_configure[file-checksums] += "${@' '.join(siteinfo_get_files(d, sysrootcache=False)[1])}" + CONFIGURE_FILES = "${S}/configure.in ${S}/configure.ac ${S}/config.h.in ${S}/acinclude.m4 Makefile.am" autotools_do_configure() { |