From daf5d25083221c065ff8667fc7ee72ffbf9d5d07 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 7 Dec 2017 19:51:41 +0530 Subject: meson: Sort globbed files before printing This ensures stability in the output, because the underlying implementation uses readdir() and the output will depend on the filesystem. This also works around a bug where g-ir-scanner's source scanner was #include-ing gmarshal.h before any other header which resulted in all marshaling symbols to be skipped from the introspection because of syntax errors. --- gir/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gir/meson.build b/gir/meson.build index e1d0119f..52838f23 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -62,7 +62,10 @@ endif globber = ''' from glob import glob -for f in glob('@0@'): +# Sort the glob for stable results. Also ensures that gmarshal.h is not +# #include-ed by scannerparser.y first because it does not include glib.h +# itself, which leaves several defines unresolved. +for f in sorted(glob('@0@')): print(f) ''' -- cgit v1.2.1