diff options
Diffstat (limited to 'meta/conf/distro/include')
| -rw-r--r-- | meta/conf/distro/include/tclibc-eglibc.inc (renamed from meta/conf/distro/include/poky-eglibc.inc) | 14 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-glibc.inc (renamed from meta/conf/distro/include/poky-glibc.inc) | 13 | ||||
| -rw-r--r-- | meta/conf/distro/include/tclibc-uclibc.inc (renamed from meta/conf/distro/include/poky-uclibc.inc) | 7 | ||||
| -rw-r--r-- | meta/conf/distro/include/tcmode-default.inc (renamed from meta/conf/distro/include/poky-default.inc) | 15 |
4 files changed, 22 insertions, 27 deletions
diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 3d2c362baf..735db7b2d0 100644 --- a/meta/conf/distro/include/poky-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -2,22 +2,18 @@ # eglibc specific configuration # +TARGET_OS = "linux" +TARGET_OS_arm = "linux-gnueabi" +TARGET_OS_armeb = "linux-gnueabi" + # 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" - -TARGET_OS = "${GLIBCTARGETOS}" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc index 4be712271a..826f545acb 100644 --- a/meta/conf/distro/include/poky-glibc.inc +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -2,21 +2,18 @@ # glibc specific configuration # +TARGET_OS = "linux" +TARGET_OS_arm = "linux-gnueabi" +TARGET_OS_armeb = "linux-gnueabi" + # 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" - -TARGET_OS = "${GLIBCTARGETOS}" CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index def9dfe447..9e254c697b 100644 --- a/meta/conf/distro/include/poky-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -2,19 +2,20 @@ # uclibc specific configuration # +TARGET_OS = "linux-uclibc" +TARGET_OS_arm = "linux-uclibceabi" +TARGET_OS_armeb = "linux-uclibceabi" + # Add uclibc overrides to the overrides. 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 = "" diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/tcmode-default.inc index 91985b3afc..f3756dcd32 100644 --- a/meta/conf/distro/include/poky-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -1,19 +1,19 @@ # -# Poky's default configuration +# Default toolchain configuration # -TARGET_VENDOR = "-poky" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}" 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 = "${POKYLIBC}-initial" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-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" @@ -50,6 +50,7 @@ PREFERRED_VERSION_elfutils ?= "0.148" # some packages using an archive format incompatible with earlier gzip PREFERRED_VERSION_gzip-native ?= "1.4" +# Setup suitable toolchain flags require conf/distro/include/as-needed.inc - +TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" |