[gobject-introspection] Fix build reproducibility
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Fix build reproducibility
- Date: Wed, 11 Dec 2019 17:42:14 +0000 (UTC)
commit 0fa2593e7e1dabdc2e08b458f997430b6c2211f2
Author: Joshua Watt <JPEWhacker gmail com>
Date: Wed Nov 20 09:03:47 2019 -0600
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>
girepository/girparser.c | 4 ----
meson.build | 1 -
2 files changed, 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]