diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2018-04-19 09:53:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-20 08:19:46 +0100 |
commit | 71b4ae25612d6dd3687fdd583ed0077e744899cb (patch) | |
tree | 08db57e74829edc0855b6d9c30903ce1bdb17d5b /meta/recipes-core | |
parent | b71709b0e23271e4bc768b7f75aa741179f88f12 (diff) | |
download | poky-71b4ae25612d6dd3687fdd583ed0077e744899cb.tar.gz |
glib-2.0/glib.inc: fix broken mingw build
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]
(From OE-Core rev: 1f53140528d79c38d4f3a82cd0a03bd0ddc87275)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 5 |
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 b7c32e64bc..f645ed6f0c 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" | |||
91 | USE_NLS_class-nativesdk = "yes" | 91 | USE_NLS_class-nativesdk = "yes" |
92 | CACHED_CONFIGUREVARS_append_class-native = " ac_cv_path_MSGFMT=/bin/false" | 92 | CACHED_CONFIGUREVARS_append_class-native = " ac_cv_path_MSGFMT=/bin/false" |
93 | 93 | ||
94 | EXEEXT = "" | ||
95 | EXEEXT_mingw32 = ".exe" | ||
96 | |||
94 | do_install_append () { | 97 | do_install_append () { |
95 | if [ -f ${D}${bindir}/gtester-report ]; then | 98 | if [ -f ${D}${bindir}/gtester-report ]; then |
96 | sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|' | 99 | sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|' |
@@ -107,7 +110,7 @@ do_install_append () { | |||
107 | 110 | ||
108 | # Make sure gio-querymodules is unique among multilibs | 111 | # Make sure gio-querymodules is unique among multilibs |
109 | if test "x${MLPREFIX}" != "x"; then | 112 | if test "x${MLPREFIX}" != "x"; then |
110 | mv ${D}${libexecdir}/gio-querymodules ${D}${libexecdir}/${MLPREFIX}gio-querymodules | 113 | mv ${D}${libexecdir}/gio-querymodules${EXEEXT} ${D}${libexecdir}/${MLPREFIX}gio-querymodules${EXEEXT} |
111 | fi | 114 | fi |
112 | } | 115 | } |
113 | 116 | ||