1407359 - Add a small framework to apply patches to MinGW

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Bug 1372958 and Bug 1407289 show that we will definitely need to apply local patches to MinGW before they are upstreamed to keep the build working.  This bug is to set up how to do that and get it approved, so landing the first or subsequent patches can easily take advantage of that mechanism.

Comment 1

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Attachment: Bug 1407359 Set up a framework for patching the MinGW toolchain

Review commit: https://reviewboard.mozilla.org/r/188102/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/188102/

Comment 2

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/188102/diff/1-2/

Comment 3

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/188102/diff/2-3/

Comment 4

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

https://reviewboard.mozilla.org/r/188102/#review193346

::: build/unix/build-gcc/mingw-sample-patch.patch:1
(Diff revision 3)
> +diff --git a/AUTHORS b/AUTHORS

I'll remove this file and the application of it in the final push, but I wanted to test that the patch process worked.

Comment 5

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Try run: https://treeherder.mozilla.org/#/jobs?repo=try&revision=949aa5352dd725e9a316c7abd3ef8cc55ae38f46&selectedJob=136035867 (Not finished at time of comment, but they look like they will be good.)

Comment 6

[Mike Hommey [:glandium]]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

https://reviewboard.mozilla.org/r/188102/#review193456

::: build/unix/build-gcc/build-gcc.sh:82
(Diff revision 3)
> +apply_gcc_patch() {
>    pushd $root_dir/gcc-$gcc_version
>    patch -p1 < $1
>    popd
>  }
>  
> +apply_mingw_patch() {
> +  pushd $root_dir/mingw-w64
> +  patch -p1 < $1
> +  popd
> +}

might as well make that more generic, like:

apply_patch() {
  pushd $root_dir/$1
  patch -p1 < $2
  popd
}

::: taskcluster/scripts/misc/build-gcc-mingw32.sh:10
(Diff revision 3)
> -# Do not define root_dir so we build everything to a tmpdir
> +root_dir=$HOME_DIR
> -#root_dir=$HOME_DIR

That seems unrelated.

Comment 7

[Mike Hommey [:glandium]]

Or, not requiring changes to scripts other than the mingw one:
apply_patch() {
  if [ $# -ge 2 ]; then
    pushd $root_dir/$1
    shift
  else
    pushd $root_dir/gcc-$gcc_version
  fi
  patch -p1 < $1
  popd
}

Comment 8

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/188102/diff/3-4/

Comment 9

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

https://reviewboard.mozilla.org/r/188102/#review193734

::: taskcluster/scripts/misc/build-gcc-mingw32.sh:10
(Diff revision 3)
> -# Do not define root_dir so we build everything to a tmpdir
> +root_dir=$HOME_DIR
> -#root_dir=$HOME_DIR

You're right, I thought it was needed, but it is not.

Comment 10

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Try run: https://treeherder.mozilla.org/#/jobs?repo=try&revision=e3342e2eaae9f758b05e78877e5166f847c56fc9

Comment 11

[Mike Hommey [:glandium]]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

https://reviewboard.mozilla.org/r/188102/#review193804

Don't forget to remove the patch before landing. Note this will force almost all toolchains to be rebuilt, delaying firefox builds for something like 90 minutes when this lands.

Comment 12

[Tom Ritter [:tjr] (OOTO until 4/30 at least)]

Comment on attachment 8917091 [details]
Bug 1407359 Set up a framework for patching the MinGW toolchain

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/188102/diff/4-5/

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2bba20317885
Set up a framework for patching the MinGW toolchain r=glandium

Comment 14

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/2bba20317885