diff options
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch new file mode 100644 index 0000000000..2a7751511b --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | From 116bc8f7a6034ce43053876a72a132fcd4e1e472 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 20 Feb 2019 19:53:07 +0100 | ||
4 | Subject: [PATCH] loaders.cache: depend on loaders being fully build | ||
5 | |||
6 | Otherwise, races have been observed: | ||
7 | https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/310/steps/7/logs/step1b | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | |||
12 | --- | ||
13 | gdk-pixbuf/meson.build | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build | ||
17 | index fc3eb33..4e7ed20 100644 | ||
18 | --- a/gdk-pixbuf/meson.build | ||
19 | +++ b/gdk-pixbuf/meson.build | ||
20 | @@ -171,6 +171,7 @@ gdkpixbuf_dep = declare_dependency(link_with: gdkpixbuf, | ||
21 | # Now check if we are building loaders as installed shared modules | ||
22 | # We do this here because shared modules depend on libgdk-pixbuf | ||
23 | dynamic_loaders = [] | ||
24 | +dynamic_loaders_dep = [] | ||
25 | |||
26 | foreach l: loaders | ||
27 | name = l[0] | ||
28 | @@ -189,6 +190,7 @@ foreach l: loaders | ||
29 | |||
30 | # We need the path to build loaders.cache for tests | ||
31 | dynamic_loaders += mod.full_path() | ||
32 | + dynamic_loaders_dep += mod | ||
33 | endif | ||
34 | endforeach | ||
35 | |||
36 | @@ -206,6 +208,7 @@ if enable_native_windows_loaders | ||
37 | install: true, | ||
38 | install_dir: gdk_pixbuf_loaderdir) | ||
39 | dynamic_loaders += mod.full_path() | ||
40 | + dynamic_loaders_dep += mod | ||
41 | endforeach | ||
42 | endif | ||
43 | endif | ||
44 | @@ -236,6 +239,7 @@ if not meson.is_cross_build() | ||
45 | loaders_cache = custom_target('loaders.cache', | ||
46 | output: 'loaders.cache', | ||
47 | capture: true, | ||
48 | + depends: [ dynamic_loaders_dep ], | ||
49 | command: [ | ||
50 | gdk_pixbuf_query_loaders, | ||
51 | dynamic_loaders, | ||