mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

bitbake.conf: make libc over-ride lower priority than _forcevariable

Browse Source 
Fix long standing quirk, _forcevariable is documented as being the
highest priority over-ride.

(From OE-Core rev: b3598b8f1ed1cdc7849e1e4f30d618e87e1bf582)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2018-05-09 20:14:55 -07:00
committed by Richard Purdie
parent 7ccd4a201c
commit 2811907b1a
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/conf/bitbake.conf
View File

@@ -735,7 +735,8 @@ DISTRO_NAME ??= "OpenEmbedded"
#
# This works for functions as well, they are really just environment variables.
# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable"
OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:forcevariable"
LIBCOVERRIDE ?= ""
CLASSOVERRIDE ?= "class-target"
DISTROOVERRIDES ?= "${@d.getVar('DISTRO') or ''}"
MACHINEOVERRIDES ?= "${MACHINE}"

2
meta/conf/distro/include/tclibc-baremetal.inc
View File

@@ -4,9 +4,7 @@
LIBCEXTENSION = ""
# Add baremetal libc overrides to the overrides.
LIBCOVERRIDE = ":libc-baremetal"
OVERRIDES .= "${LIBCOVERRIDE}"
ASSUME_PROVIDED += "virtual/libc virtual/libiconv virtual/crypt"

2
meta/conf/distro/include/tclibc-glibc.inc
View File

@@ -4,9 +4,7 @@
LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}"
# Add glibc overrides to the overrides for glibc.
LIBCOVERRIDE = ":libc-glibc"
OVERRIDES .= "${LIBCOVERRIDE}"
PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"

2
meta/conf/distro/include/tclibc-musl.inc
View File

@@ -4,9 +4,7 @@
LIBCEXTENSION = "-musl"
# Add musl libc overrides to the overrides.
LIBCOVERRIDE = ":libc-musl"
OVERRIDES .= "${LIBCOVERRIDE}"
PREFERRED_PROVIDER_virtual/libc ?= "musl"
PREFERRED_PROVIDER_virtual/libiconv ?= "musl"