conf/distrosetup: Clean up default libc config and sync with OE-Core (artifact of merge issue)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
f10292ab39
commit
4d62860da3
|
@ -10,17 +10,11 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
|
|||
# Add glibc overrides to the overrides for eglibc.
|
||||
OVERRIDES .= ":libc-glibc"
|
||||
|
||||
#eglibc
|
||||
PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
|
||||
PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
|
||||
PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc ?= "eglibc"
|
||||
|
||||
#eglibc-nativesdk
|
||||
PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk"
|
||||
|
||||
CXXFLAGS += "-fvisibility-inlines-hidden"
|
||||
|
||||
|
|
|
@ -10,16 +10,11 @@ TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d
|
|||
# Add glibc to the overrides.
|
||||
OVERRIDES =. "libc-glibc:"
|
||||
|
||||
#glibc
|
||||
PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
|
||||
PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
|
||||
PREFERRED_PROVIDER_virtual/libc ?= "glibc"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
|
||||
|
||||
#glibc-nativesdk
|
||||
PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk"
|
||||
|
||||
CXXFLAGS += "-fvisibility-inlines-hidden"
|
||||
|
||||
|
|
|
@ -10,15 +10,12 @@ TARGET_OS_armeb = "linux-uclibceabi"
|
|||
OVERRIDES =. "libc-uclibc:"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/libc = "uclibc"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc"
|
||||
PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
|
||||
PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
|
||||
|
||||
USE_NLS ?= "no"
|
||||
USE_NLS_glib-2.0 = "yes"
|
||||
|
||||
TARGET_OS = "${UCLIBCTARGETOS}"
|
||||
|
||||
CXXFLAGS += "-fvisibility-inlines-hidden"
|
||||
|
||||
IMAGE_LINGUAS = ""
|
||||
|
|
|
@ -2,16 +2,18 @@
|
|||
# Default toolchain configuration
|
||||
#
|
||||
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"
|
||||
|
||||
# Default libc config
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
|
||||
PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk"
|
||||
PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
|
||||
|
||||
GCCVERSION ?= "4.5.1"
|
||||
|
|
Loading…
Reference in New Issue