[PATCH] gtk+3: fix reproducible build failure

[PATCH] gtk+3: fix reproducible build failure

[Ross Burton]

From: Ross Burton <ross.burton@arm.com>

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.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-gnome/gtk+/gtk+3.inc | 8 ++++++++
 1 file changed, 8 insertions(+)

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 += " \
-- 
2.26.2

Re: [OE-core] [PATCH] gtk+3: fix reproducible build failure

[Khem Raj]

On 7/6/20 4:57 AM, Ross Burton wrote:
> From: Ross Burton <ross.burton@arm.com>
> 
> 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.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>   meta/recipes-gnome/gtk+/gtk+3.inc | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> 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]

will touching these files will help too?

>   }
>   
>   EXTRA_OECONF += " \
> 
> 
> 
> 

Re: [OE-core] [PATCH] gtk+3: fix reproducible build failure

[Ross Burton]

Probably, but the upstream solution is to not ship them, so this is
basically reproducing that with an existing tarball.

Ross

On Mon, 6 Jul 2020 at 20:35, Khem Raj <raj.khem@gmail.com> wrote:
>
>
>
> On 7/6/20 4:57 AM, Ross Burton wrote:
> > From: Ross Burton <ross.burton@arm.com>
> >
> > 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.
> >
> > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > ---
> >   meta/recipes-gnome/gtk+/gtk+3.inc | 8 ++++++++
> >   1 file changed, 8 insertions(+)
> >
> > 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]
>
> will touching these files will help too?
>
> >   }
> >
> >   EXTRA_OECONF += " \
> >
> >
> > 
> >