summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2016-08-20 11:03:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-28 15:32:37 +0100
commit0968fa52cfdb5cf1b2f502acd1c4090050bea0c2 (patch)
treea480554be9f6a83f439f33276c76048518647946 /conf
parentee65e77639b406fd267cbceddafda03a35223525 (diff)
downloadmeta-mingw-0968fa52cfdb5cf1b2f502acd1c4090050bea0c2.tar.gz
*-mingw32.conf: Upgrade for krogoth
Use explicit mingw32 override for PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial to avoid multiple providers and consequently broken builds. Allow building static libraries, disabled by default. Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine-sdk/i686-mingw32.conf7
-rw-r--r--conf/machine-sdk/x86_64-mingw32.conf7
2 files changed, 12 insertions, 2 deletions
diff --git a/conf/machine-sdk/i686-mingw32.conf b/conf/machine-sdk/i686-mingw32.conf
index 0bdedaa..d426fe3 100644
--- a/conf/machine-sdk/i686-mingw32.conf
+++ b/conf/machine-sdk/i686-mingw32.conf
@@ -3,7 +3,8 @@ SDK_OS = "mingw32"
3 3
4GCCTHREADS_mingw32 = "win32" 4GCCTHREADS_mingw32 = "win32"
5 5
6PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" 6PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime"
7PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime"
7PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" 8PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime"
8PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" 9PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime"
9PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" 10PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv"
@@ -29,3 +30,7 @@ export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
29export RC = "${WINDRES}" 30export RC = "${WINDRES}"
30 31
31BB_HASHBASE_WHITELIST_append = " WINDRES RC" 32BB_HASHBASE_WHITELIST_append = " WINDRES RC"
33
34# Needed to override no-static-libs.inc
35DISABLE_STATIC_mingw32 = ""
36
diff --git a/conf/machine-sdk/x86_64-mingw32.conf b/conf/machine-sdk/x86_64-mingw32.conf
index 5e80dfa..b9706f9 100644
--- a/conf/machine-sdk/x86_64-mingw32.conf
+++ b/conf/machine-sdk/x86_64-mingw32.conf
@@ -3,7 +3,8 @@ SDK_OS = "mingw32"
3 3
4GCCTHREADS_mingw32 = "win32" 4GCCTHREADS_mingw32 = "win32"
5 5
6PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-mingw-w64-runtime" 6PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc_mingw32 = "nativesdk-mingw-w64-runtime"
7PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial_mingw32 = "nativesdk-mingw-w64-runtime"
7PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime" 8PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-mingw-w64-runtime"
8PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime" 9PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-mingw-w64-runtime"
9PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv" 10PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-libiconv"
@@ -29,3 +30,7 @@ export WINDRES = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
29export RC = "${WINDRES}" 30export RC = "${WINDRES}"
30 31
31BB_HASHBASE_WHITELIST_append = " WINDRES RC" 32BB_HASHBASE_WHITELIST_append = " WINDRES RC"
33
34# Needed to override no-static-libs.inc
35DISABLE_STATIC_mingw32 = ""
36