aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2018-04-19 09:53:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-20 08:19:36 +0100
commit1f53140528d79c38d4f3a82cd0a03bd0ddc87275 (patch)
treecd54622a6f93969f080b12c8de6d81583adc5019
parenta4941af2d3624aecc5dcd7ff54b7ea8c9e9dee8b (diff)
downloadopenembedded-core-master.zip
openembedded-core-master.tar.gz
openembedded-core-master.tar.bz2
glib-2.0/glib.inc: fix broken mingw buildHEADsumomaster
mingw build was broken by the commit: "glib-2.0/glib.inc: apply MLPREFIX renaming to all package classes" When building for mingw, we encounter build errors such as: mv: cannot stat '<builddir>/<...>/usr/libexec/gio-querymodules': No such file or directory The mingw file that exists is "gio-querymodules.exe" instead of "gio-qeurymodules". The fix is to append the names of executables by an OS specific EXEEXT. [YOCTO #12679] Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index b7c32e6..f645ed6 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -91,6 +91,9 @@ USE_NLS_class-target = "yes"
USE_NLS_class-nativesdk = "yes"
CACHED_CONFIGUREVARS_append_class-native = " ac_cv_path_MSGFMT=/bin/false"
+EXEEXT = ""
+EXEEXT_mingw32 = ".exe"
+
do_install_append () {
if [ -f ${D}${bindir}/gtester-report ]; then
sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|'
@@ -107,7 +110,7 @@ do_install_append () {
# Make sure gio-querymodules is unique among multilibs
if test "x${MLPREFIX}" != "x"; then
- mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules
+ mv ${D}${libexecdir}/gio-querymodules${EXEEXT} ${D}${libexecdir}/${MLPREFIX}gio-querymodules${EXEEXT}
fi
}