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.bystri...@intel.com>
---
conf/machine-sdk/i686-mingw32.conf | 7 ++++++-
conf/machine-sdk/x86_64-mingw32.conf | 7 ++++++-
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"
GCCTHREADS_mingw32 = "win32"
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc =
"nativesdk-mingw-w64-runtime"
+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-libiconv = "nativesdk-libiconv"
@@ -29,3 +30,7 @@ export WINDRES = "${HOST_PREFIX}windres
--include-dir=${STAGING_INCDIR}"
export RC = "${WINDRES}"
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 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"
GCCTHREADS_mingw32 = "win32"
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc =
"nativesdk-mingw-w64-runtime"
+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-libiconv = "nativesdk-libiconv"
@@ -29,3 +30,7 @@ export WINDRES = "${HOST_PREFIX}windres
--include-dir=${STAGING_INCDIR}"
export RC = "${WINDRES}"
BB_HASHBASE_WHITELIST_append = " WINDRES RC"
+
+# Needed to override no-static-libs.inc
+DISABLE_STATIC_mingw32 = ""
+
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
