From 52515d8bee445d728d5fe63bfcbca79b5d8ea250 Mon Sep 17 00:00:00 2001
From: Mark Hatle <[mark.hatle@windriver.com]>
Date: Mon, 28 Aug 2017 14:23:35 -0700
Subject: Fix Yocto Project compatible errors

Each of the recipes modified fail the YP compatible checking script because
they modify the checksum of the package, even when the mingw32 SDK is not
enabled.

This is corrected by ensuring that each of the settings is only done when
the mingw32 override is enabled.

The PACKAGECONFIG options are moved to oe-core, as there is no way to
specify they should only available in the mingw32 override is enabled.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 recipes-core/gettext/gettext_0.19.%.bbappend       | 6 +++---
 recipes-graphics/libsdl/libsdl_%.bbappend          | 5 -----
 recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/recipes-core/gettext/gettext_0.19.%.bbappend b/recipes-core/gettext/gettext_0.19.%.bbappend
index 9835d7b..b33970a 100644
--- a/recipes-core/gettext/gettext_0.19.%.bbappend
+++ b/recipes-core/gettext/gettext_0.19.%.bbappend
@@ -4,14 +4,14 @@ LDFLAGS_prepend_mingw32 = " -lpthread "
 CFLAGS_append_mingw32 = " -DLIBXML_STATIC"
 EXTRA_OECONF_append_mingw32 = " --enable-threads=windows --enable-static"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-SRC_URI_append = " \
+FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${BPN}:"
+SRC_URI_append_mingw32 = " \
 		file://fix-gl_cv_prog_as_underscore-test.patch \
 		"
 
 FILES_libgettextlib_mingw32 = "${bindir}/libgettextlib-*.dll"
 FILES_libgettextsrc_mingw32 = "${bindir}/libgettextsrc-*.dll"
 
-PACKAGES =+ "libintl"
+PACKAGES_prepend_mingw32 = "libintl "
 FILES_libintl_mingw32 = "${bindir}/libintl*.dll"
 
diff --git a/recipes-graphics/libsdl/libsdl_%.bbappend b/recipes-graphics/libsdl/libsdl_%.bbappend
index bb65f03..592ace5 100644
--- a/recipes-graphics/libsdl/libsdl_%.bbappend
+++ b/recipes-graphics/libsdl/libsdl_%.bbappend
@@ -1,9 +1,4 @@
 # Disable default x11 support
 PACKAGECONFIG_class-nativesdk_mingw32 = ""
 
-# Configs that only apply to Windows/MinGW
-PACKAGECONFIG[stdio-redirect] = "--enable-stdio-redirect,--disable-stdio-redirect"
-PACKAGECONFIG[directx] = "--enable-directx,--disable-directx"
-
 FILES_${PN}-bin_mingw32 = "${bindir}/*.exe ${sbindir}/*.exe"
-
diff --git a/recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend b/recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend
index e30e376..3da0f53 100644
--- a/recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend
+++ b/recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend
@@ -1,6 +1,6 @@
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " \
+FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/files:"
+SRC_URI_append_mingw32 = " \
 		file://configure.ac-Set-mym4_revision-to-0-if-not-a-git-rep.patch \
 		"
 
-- 
cgit v1.2.3-54-g00ecf