mbox series

[0/4] ci: fix windows-build with GCC v12.x

Message ID pull.1238.git.1653351786.gitgitgadget@gmail.com (mailing list archive)
Headers show
Series ci: fix windows-build with GCC v12.x | expand

Message

Phillip Wood via GitGitGadget May 24, 2022, 12:23 a.m. UTC
A recent update of GCC in Git for Windows' SDK (a subset of which is used in
Git's CI/PR builds) broke the build.

These patches address that, and they are based on maint-2.34 (earlier
maintenance tracks would have a trivial merge conflict due to 013c7e2b070
(http: drop support for curl < 7.16.0, 2021-07-30) removing support for
USE_CURL_MULTI).

Johannes Schindelin (4):
  compat/win32/syslog: fix use-after-realloc
  nedmalloc: avoid new compile error
  http.c: avoid danging pointer to local variable `finished`
  dir.c: avoid "exceeds maximum object size" error with GCC v12.x

 compat/nedmalloc/nedmalloc.c |  1 -
 compat/win32/syslog.c        |  2 ++
 dir.c                        |  9 +++++++++
 http-walker.c                |  4 ----
 http.c                       | 15 +++++++--------
 http.h                       |  2 +-
 6 files changed, 19 insertions(+), 14 deletions(-)


base-commit: 2f0dde7852b7866bb044926f73334ff3fc30654b
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1238%2Fdscho%2Ffix-win-build-with-gcc-12-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1238/dscho/fix-win-build-with-gcc-12-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1238

Comments

Jeff Hostetler May 24, 2022, 3:54 p.m. UTC | #1
On 5/23/22 8:23 PM, Johannes Schindelin via GitGitGadget wrote:
> A recent update of GCC in Git for Windows' SDK (a subset of which is used in
> Git's CI/PR builds) broke the build.
> 
> These patches address that, and they are based on maint-2.34 (earlier
> maintenance tracks would have a trivial merge conflict due to 013c7e2b070
> (http: drop support for curl < 7.16.0, 2021-07-30) removing support for
> USE_CURL_MULTI).
> 
> Johannes Schindelin (4):
>    compat/win32/syslog: fix use-after-realloc
>    nedmalloc: avoid new compile error
>    http.c: avoid danging pointer to local variable `finished`
>    dir.c: avoid "exceeds maximum object size" error with GCC v12.x
> 
>   compat/nedmalloc/nedmalloc.c |  1 -
>   compat/win32/syslog.c        |  2 ++
>   dir.c                        |  9 +++++++++
>   http-walker.c                |  4 ----
>   http.c                       | 15 +++++++--------
>   http.h                       |  2 +-
>   6 files changed, 19 insertions(+), 14 deletions(-)
> 
> 
> base-commit: 2f0dde7852b7866bb044926f73334ff3fc30654b
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1238%2Fdscho%2Ffix-win-build-with-gcc-12-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1238/dscho/fix-win-build-with-gcc-12-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1238
> 

This looks good to me.  I reviewed it earlier in one of our
downstream forks.

Jeff