]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
glib-2.0/glib.inc: fix broken mingw build
authorJuro Bystricky <juro.bystricky@intel.com>
Thu, 19 Apr 2018 16:53:02 +0000 (09:53 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 20 Apr 2018 07:19:36 +0000 (08:19 +0100)
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>
meta/recipes-core/glib-2.0/glib.inc

index b7c32e64bc809ff3f5fdf41aa287555985bfb608..f645ed6f0cf2980b3a991f860366f4da66c8fd2f 100644 (file)
@@ -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
 }