| Submitter | Khem Raj |
|---|---|
| Date | Sept. 4, 2012, 5:16 a.m. |
| Message ID | <1346735783-30393-1-git-send-email-raj.khem@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/35779/ |
| State | New |
| Headers | show |
Comments
On Mon, 2012-09-03 at 22:16 -0700, Khem Raj wrote: > Currently gettext and eglibc compete to provide for libintl on > nativesdk. So make choices to select eglibc nativesdk to provide > for both eglibc as well as uclibc based systems. > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/conf/distro/include/tclibc-eglibc.inc | 1 + > meta/conf/distro/include/tclibc-uclibc.inc | 2 ++ > 2 files changed, 3 insertions(+) Merged to master, thanks. Richard
Patch
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc index 1c9e7e9..15f5ee5 100644 --- a/meta/conf/distro/include/tclibc-eglibc.inc +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -10,6 +10,7 @@ OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc" diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc index 3984235..9245112 100644 --- a/meta/conf/distro/include/tclibc-uclibc.inc +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -11,6 +11,8 @@ OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc" +PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc" USE_NLS ?= "no"
Currently gettext and eglibc compete to provide for libintl on nativesdk. So make choices to select eglibc nativesdk to provide for both eglibc as well as uclibc based systems. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/conf/distro/include/tclibc-eglibc.inc | 1 + meta/conf/distro/include/tclibc-uclibc.inc | 2 ++ 2 files changed, 3 insertions(+)