Fix Yocto Project compatible errors

PATCH New Mark Hatle 1 participant 1 message Aug 28, 2017

Share & tools

Mark Hatle

author

2017-08-28 20:32 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 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(-)

recipes-core/gettext/gettext_0.19.%.bbappend +3 -3

index 9835d7b..b33970a 100644
@@ -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"

recipes-graphics/libsdl/libsdl_%.bbappend +0 -5

index bb65f03..592ace5 100644
@@ -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"
-

recipes-support/libgcrypt/libgcrypt_1.8.%.bbappend +2 -2

index e30e376..3da0f53 100644
@@ -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 \
 		"

Signature · 1 line

1.8.3.1