Skip to contentSkip to conversation

machine-sdk: use gettext for libintl, not mingw-runtime

PATCH New Ross Burton 1 participant 1 message Jan 10, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 conf/machine-sdk/i686-mingw32.conf   | 3 +--
 conf/machine-sdk/x86_64-mingw32.conf | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
conf/machine-sdk/i686-mingw32.conf +1 -2
index d426fe3..cb08bee 100644
@@ -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 = ""
-
conf/machine-sdk/x86_64-mingw32.conf +1 -2
index b9706f9..8786413 100644
@@ -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 = ""
-
Signature · 1 line
2.11.0