GNOME Bugzilla – Bug 796273
meson [1.14]: Fix detection of glib-mkenums under MSYS2
Last modified: 2018-05-20 16:20:23 UTC
Created attachment 372235 [details] [review] meson: Fix detection of glib-mkenums under MSYS2 Under MSYS2 glib-mkenums is an executable and has a .exe extension and the path does not end with "glib-mkenums". Make the script compare the path without the file extension instead. ---- Those scripts are gone in master, so this is for 1.14 only.
Comment on attachment 372235 [details] [review] meson: Fix detection of glib-mkenums under MSYS2 Or maybe we should backport the commit that makes it use gnome.mkenums_simple() from master instead.
ok, I'll give that a try. Assuming the current meson_version>=0.40.1 is correct, this would bump it to >=0.42.0
Right. I think that'd be fine, since meson is still not our primary build system officially. Will think about it.
Created attachment 372240 [details] [review] 0001-meson-delete-unused-variable.patch
Created attachment 372241 [details] [review] 0002-meson-use-gnome.mkenums_simple-to-generate-controlle
Created attachment 372242 [details] [review] 0003-meson-use-gnome.mkenums_simple-to-generate-core-enum
Created attachment 372243 [details] [review] 0004-meson-bump-meson-req-for-gnome.mkenums_simple
These are the four patches from master which could be backported. The first three applied cleanly, the last has a small conflict due to the library version number. Tested under MSYS2 and Debian sid. (I'm not sure re-attaching these here helps you in any way, so please tell and I wont in the future)
s/the last has/the last had/
It's fine to list the commits to cherry-pick in future, no need to attach patches for that. For 1.14, let's go with your original patch. I prefer to keep the diff as small as possible between bug-fix releases.
Thanks for the patch! commit 7cbbdf3a90ef8d92c993d0b1a1c3a73d03f6bca4 (HEAD -> 1.14) Author: Christoph Reiter <reiter.christoph@gmail.com> Date: Sun May 20 13:53:31 2018 +0200 meson: Fix detection of glib-mkenums under MSYS2 Under MSYS2 glib-mkenums is an executable and has a .exe extension and the path does not end with "glib-mkenums". Make the script compare the path without the file extension instead. https://bugzilla.gnome.org/show_bug.cgi?id=796273
\o/ Thanks!