diff options
| -rw-r--r-- | meta/conf/distro/include/poky-default.inc | 4 | ||||
| -rw-r--r-- | meta/conf/distro/include/poky-glibc.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.12.bb | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc index bc1db89f3..62d527366 100644 --- a/meta/conf/distro/include/poky-default.inc +++ b/meta/conf/distro/include/poky-default.inc @@ -4,7 +4,7 @@ TARGET_VENDOR = "-poky" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = ${POKYLIBC} +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" @@ -12,6 +12,8 @@ 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 = "glibc-initial" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk" + GCCVERSION ?= "4.5.0" GCCVERSION_powerpc ?= "4.3.3" diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc index 5d300c6df..35c6fc162 100644 --- a/meta/conf/distro/include/poky-glibc.inc +++ b/meta/conf/distro/include/poky-glibc.inc @@ -2,11 +2,17 @@ # glibc specific configuration # +#glibc PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" 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/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 8ee6bba06..01bda10dc 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -28,7 +28,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-pic eglibc-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" +PACKAGES = "${PN}-dbg ${PN} catchsegv sln nscd ldd localedef ${PN}-utils ${PN}-pic ${PN}-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" PACKAGES_DYNAMIC = " \ glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* \ diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index f1b84967b..45e152079 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -95,3 +95,5 @@ do_compile () { } require eglibc-package.inc + +BBCLASSEXTEND = "nativesdk" |