From 441eb2f9bf16d88dd8b7c213438125b8122fb4a0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 10 Jan 2018 17:04:21 +0000 Subject: machine-sdk: use gettext for libintl, not mingw-runtime The MinGW runtime doesn't provide libintl, so set gettext as the preferred provider for libintl. Signed-off-by: Ross Burton --- conf/machine-sdk/i686-mingw32.conf | 3 +-- conf/machine-sdk/x86_64-mingw32.conf | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/machine-sdk/i686-mingw32.conf b/conf/machine-sdk/i686-mingw32.conf index d426fe3..cb08bee 100644 --- a/conf/machine-sdk/i686-mingw32.conf +++ b/conf/machine-sdk/i686-mingw32.conf @@ -6,7 +6,7 @@ GCCTHREADS_mingw32 = "win32" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" -PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" +PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" USE_NLS_mingw32 = "no" @@ -33,4 +33,3 @@ BB_HASHBASE_WHITELIST_append = " WINDRES RC" # Needed to override no-static-libs.inc DISABLE_STATIC_mingw32 = "" - diff --git a/conf/machine-sdk/x86_64-mingw32.conf b/conf/machine-sdk/x86_64-mingw32.conf index b9706f9..8786413 100644 --- a/conf/machine-sdk/x86_64-mingw32.conf +++ b/conf/machine-sdk/x86_64-mingw32.conf @@ -6,7 +6,7 @@ GCCTHREADS_mingw32 = "win32" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" -PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" +PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" USE_NLS_mingw32 = "no" @@ -33,4 +33,3 @@ BB_HASHBASE_WHITELIST_append = " WINDRES RC" # Needed to override no-static-libs.inc DISABLE_STATIC_mingw32 = "" - -- cgit v1.2.3-54-g00ecf