summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-11-21 10:58:00 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-27 13:25:18 +0000
commit7a9185b2199dc4c3f3410819228549c1ef8ac511 (patch)
tree7366467a14dac72a1a0e48e70b5312c9b25605a7 /meta
parent3a78b1a27fc3de68cd6710b656884b8c64abc0cd (diff)
downloadpoky-7a9185b2199dc4c3f3410819228549c1ef8ac511.tar.gz
gobject-introspection: Fix reproducibility
Adds a patch to remove build paths from gobject-introspection (From OE-Core rev: a2de15f7f52d42e0c0440c907149c773ad99e110) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch50
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb1
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch
new file mode 100644
index 0000000000..9e1f79e881
--- /dev/null
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch
@@ -0,0 +1,50 @@
1From 59d2cbb54c012b25adeb965a94b6585d911a4539 Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Wed, 20 Nov 2019 09:03:47 -0600
4Subject: [PATCH] Fix build reproducibility
5
6ba744068 ("Make meson.override_find_program working on more complex use
7cases") made the build no longer reproducible by encoding a build system
8path into the output. This shouldn't be necessary anyway, since it
9should be possible to add new paths to search for gir files by setting
10the XDG_DATA_DIR environment variable.
11
12Closes #318
13
14Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/192]
15Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
16---
17 girepository/girparser.c | 4 ----
18 meson.build | 1 -
19 2 files changed, 5 deletions(-)
20
21diff --git a/girepository/girparser.c b/girepository/girparser.c
22index fb47e75c..53450baf 100644
23--- a/girepository/girparser.c
24+++ b/girepository/girparser.c
25@@ -309,10 +309,6 @@ locate_gir (GIrParser *parser,
26 if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
27 return path;
28 g_free (path);
29- path = g_build_filename (UNINSTALLED_GIR_DIR, girname, NULL);
30- if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
31- return path;
32- g_free (path);
33 return NULL;
34 }
35
36diff --git a/meson.build b/meson.build
37index d6231c5f..2f248579 100644
38--- a/meson.build
39+++ b/meson.build
40@@ -90,7 +90,6 @@ endif
41 girdir = join_paths(gir_dir_prefix, 'gir-1.0')
42 config.set_quoted('GIR_DIR', girdir)
43 config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
44-config.set_quoted('UNINSTALLED_GIR_DIR', join_paths(meson.current_build_dir(), 'gir'))
45
46 foreach type : ['char', 'short', 'int', 'long']
47 size = cc.sizeof(type)
48--
492.23.0
50
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
index a9739cc552..b1371776af 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.62.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
21 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ 21 file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
22 file://0001-Port-cross-compilation-support-to-meson.patch \ 22 file://0001-Port-cross-compilation-support-to-meson.patch \
23 file://0001-meson.build-disable-tests-when-cross-compiling.patch \ 23 file://0001-meson.build-disable-tests-when-cross-compiling.patch \
24 file://0001-Fix-build-reproducibility.patch \
24 " 25 "
25 26
26SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1" 27SRC_URI[md5sum] = "37278eab3704e42234b6080b8cf241f1"