diff options
| author |   Ross Burton <ross.burton@arm.com> | 2020-07-06 12:57:07 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-08 10:37:12 +0100 |
| commit | df2c56f4d55d5edce77548cde0e1dc4d83503844 (patch) | |
| tree | a617f7d2a6164bd8027b3312cb6628d4034da4fb | |
| parent | 07a73aae71f4fbea5c4aa2b64cc0478eea90d363 (diff) | |
| download | poky-df2c56f4d55d5edce77548cde0e1dc4d83503844.tar.gz | |
gtk+3: fix reproducible build failure
There's a build race between the use of a pre-generated file and
re-generating it again, which breaks reproducible builds. Solve the
race by deleting the shipped generated file.
(From OE-Core rev: c2e0b0785b8098dbe562e88f54b679ca87626937)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc index e1ecf504a0..8d5edb7ee8 100644 --- a/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/meta/recipes-gnome/gtk+/gtk+3.inc @@ -1,3 +1,4 @@ + SUMMARY = "Multi-platform toolkit for creating GUIs" DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." @@ -31,6 +32,13 @@ do_configure_prepend() { ln -s ${TARGET_PREFIX}libtool libtool #delete a file that will get confused with generated one in ${B} rm -f ${S}/gtk/gtktypefuncs.c + + # These files are generated by wayland-scanner but will race over modification + # time between the copies in the sysroot from wayland-protocols and the copy + # in the source tree. Solve the race by deleting so they need to be regenerated. + # 3.24.22 will not be shipping these files so this can be deleted then: + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183 + rm -f ${S}/modules/input/text-input-unstable-v3*.[ch] } EXTRA_OECONF += " \ |