diff options
| author | Joshua Watt <JPEWhacker@gmail.com> | 2019-11-20 09:03:47 -0600 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-12-11 18:30:14 +0100 |
| commit | 0fa2593e7e1dabdc2e08b458f997430b6c2211f2 (patch) | |
| tree | c1c4adfab8eb33342c9e0f5d40464f184dfe3840 | |
| parent | d2b48963894c0ee1a34b22632f8df9f66f274b5b (diff) | |
| download | gobject-introspection-0fa2593e7e1dabdc2e08b458f997430b6c2211f2.tar.gz | |
Fix build reproducibility
ba744068 ("Make meson.override_find_program working on more complex use
cases") made the build no longer reproducible by encoding a build system
path into the output. This shouldn't be necessary anyway, since it
should be possible to add new paths to search for gir files by setting
the XDG_DATA_DIR environment variable.
Closes #318
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
| -rw-r--r-- | girepository/girparser.c | 4 | ||||
| -rw-r--r-- | meson.build | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/girepository/girparser.c b/girepository/girparser.c index fb47e75c..53450baf 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -309,10 +309,6 @@ locate_gir (GIrParser *parser, if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) return path; g_free (path); - path = g_build_filename (UNINSTALLED_GIR_DIR, girname, NULL); - if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) - return path; - g_free (path); return NULL; } diff --git a/meson.build b/meson.build index f7999d35..df18e467 100644 --- a/meson.build +++ b/meson.build @@ -90,7 +90,6 @@ endif girdir = join_paths(gir_dir_prefix, 'gir-1.0') config.set_quoted('GIR_DIR', girdir) config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) -config.set_quoted('UNINSTALLED_GIR_DIR', join_paths(meson.current_build_dir(), 'gir')) foreach type : ['char', 'short', 'int', 'long'] size = cc.sizeof(type) |