diff options
author | Dan Callaghan <dan.callaghan@opengear.com> | 2019-08-05 11:13:53 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-06 14:58:10 +0100 |
commit | 25ed4f7073bade8c46be3eab5092fb7086161af9 (patch) | |
tree | 8a222f680eebcc72def0ead3ad6ab14d71344a0b /meta/classes | |
parent | 96357a78f43866a588d6ff9955ca5b8639080f94 (diff) | |
download | poky-25ed4f7073bade8c46be3eab5092fb7086161af9.tar.gz |
autotools: always include config_site.d files in CONFIG_SITE
Fixes: https://bugzilla.yoctoproject.org/show_bug.cgi?id=13375
(From OE-Core rev: e60c170b451a4aa561d08bfce97dca05508c2106)
Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/autotools.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 8768a6ad68..3d22ad0255 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass | |||
@@ -25,7 +25,9 @@ inherit siteinfo | |||
25 | 25 | ||
26 | # Space separated list of shell scripts with variables defined to supply test | 26 | # Space separated list of shell scripts with variables defined to supply test |
27 | # results for autoconf tests we cannot run at build time. | 27 | # results for autoconf tests we cannot run at build time. |
28 | export CONFIG_SITE = "${@siteinfo_get_files(d)}" | 28 | # The value of this variable is filled in in a prefunc because it depends on |
29 | # the contents of the sysroot. | ||
30 | export CONFIG_SITE | ||
29 | 31 | ||
30 | acpaths ?= "default" | 32 | acpaths ?= "default" |
31 | EXTRA_AUTORECONF = "--exclude=autopoint" | 33 | EXTRA_AUTORECONF = "--exclude=autopoint" |
@@ -132,6 +134,8 @@ EXTRACONFFUNCS ??= "" | |||
132 | EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" | 134 | EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" |
133 | 135 | ||
134 | do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}" | 136 | do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}" |
137 | do_compile[prefuncs] += "autotools_aclocals" | ||
138 | do_install[prefuncs] += "autotools_aclocals" | ||
135 | do_configure[postfuncs] += "autotools_postconfigure" | 139 | do_configure[postfuncs] += "autotools_postconfigure" |
136 | 140 | ||
137 | ACLOCALDIR = "${STAGING_DATADIR}/aclocal" | 141 | ACLOCALDIR = "${STAGING_DATADIR}/aclocal" |
@@ -140,7 +144,6 @@ ACLOCALEXTRAPATH_class-target = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" | |||
140 | ACLOCALEXTRAPATH_class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" | 144 | ACLOCALEXTRAPATH_class-nativesdk = " -I ${STAGING_DATADIR_NATIVE}/aclocal/" |
141 | 145 | ||
142 | python autotools_aclocals () { | 146 | python autotools_aclocals () { |
143 | # Refresh variable with cache files | ||
144 | d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True)) | 147 | d.setVar("CONFIG_SITE", siteinfo_get_files(d, sysrootcache=True)) |
145 | } | 148 | } |
146 | 149 | ||