diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-01-10 17:04:21 +0000 |
|---|---|---|
| committer | Ross Burton <ross.burton@intel.com> | 2018-01-10 17:04:21 +0000 |
| commit | 441eb2f9bf16d88dd8b7c213438125b8122fb4a0 (patch) | |
| tree | f15cf23103ad6a0b1c7cedd85f9d88ada2678c11 | |
| parent | a2c5fb82e5595d5bb56b579b7c93147c4fb065a5 (diff) | |
| download | meta-mingw-441eb2f9bf16d88dd8b7c213438125b8122fb4a0.tar.gz | |
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 <ross.burton@intel.com>
| -rw-r--r-- | conf/machine-sdk/i686-mingw32.conf | 3 | ||||
| -rw-r--r-- | 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" | |||
| 6 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" | 6 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" |
| 7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" | 7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" |
| 8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" | 8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" |
| 9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" | 9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" |
| 10 | PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" | 10 | PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" |
| 11 | 11 | ||
| 12 | USE_NLS_mingw32 = "no" | 12 | USE_NLS_mingw32 = "no" |
| @@ -33,4 +33,3 @@ BB_HASHBASE_WHITELIST_append = " WINDRES RC" | |||
| 33 | 33 | ||
| 34 | # Needed to override no-static-libs.inc | 34 | # Needed to override no-static-libs.inc |
| 35 | DISABLE_STATIC_mingw32 = "" | 35 | DISABLE_STATIC_mingw32 = "" |
| 36 | |||
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" | |||
| 6 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" | 6 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime" |
| 7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" | 7 | PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime" |
| 8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" | 8 | PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" |
| 9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" | 9 | PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-gettext" |
| 10 | PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" | 10 | PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" |
| 11 | 11 | ||
| 12 | USE_NLS_mingw32 = "no" | 12 | USE_NLS_mingw32 = "no" |
| @@ -33,4 +33,3 @@ BB_HASHBASE_WHITELIST_append = " WINDRES RC" | |||
| 33 | 33 | ||
| 34 | # Needed to override no-static-libs.inc | 34 | # Needed to override no-static-libs.inc |
| 35 | DISABLE_STATIC_mingw32 = "" | 35 | DISABLE_STATIC_mingw32 = "" |
| 36 | |||