Emacs master build broken [MSYS2/UCRT64]

Emacs master build broken [MSYS2/UCRT64]

[Angelo Graziosi]

I have built master two day ago on MSYS2/UCRT64 using their patches (https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-emacs).

Now a recent change (Po Lu f2f2e6a082a541 ?) to src/sysdep.c has broken the build because the MSYS2 people patche does not apply:

patching file nt/cmdproxy.c
Hunk #1 succeeded at 38 (offset 3 lines).
patching file src/sysdep.c
Hunk #1 succeeded at 2985 (offset 292 lines).
Hunk #2 FAILED at 2704.
1 out of 2 hunks FAILED -- saving rejects to file src/sysdep.c.rej
Error: Failure patching nt/cmdproxy.c

where

$ cat emacs-master/src/sysdep.c.rej
--- src/sysdep.c.orig   2022-06-23 20:59:02.252891700 +0200
+++ src/sysdep.c        2022-06-23 21:05:31.998322600 +0200
@@ -2704,7 +2706,11 @@
   if (err | (ADDRESS_SANITIZER
             ? fflush (stderr) != 0 || ferror (stderr)
             : close_stream (stderr) != 0))
+#ifndef _UCRT // XXX: close_stream(stderr) fails for some reason
     _exit (EXIT_FAILURE);
+#else
+    ;
+#endif
 }


 #ifndef DOS_NT

Maybe you now how this should be fixed...

TIA

Re: Emacs master build broken [MSYS2/UCRT64]

[Angelo Graziosi]

> Il 18/08/2023 23:35 CEST Angelo Graziosi ha scritto:
> 
>  
> I have built master two day ago on MSYS2/UCRT64 using their patches (https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-emacs).
> 
> Now a recent change (Po Lu f2f2e6a082a541 ?) to src/sysdep.c has broken the build because the MSYS2 people patche does not apply:
> 
> patching file nt/cmdproxy.c
> Hunk #1 succeeded at 38 (offset 3 lines).
> patching file src/sysdep.c
> Hunk #1 succeeded at 2985 (offset 292 lines).
> Hunk #2 FAILED at 2704.
> 1 out of 2 hunks FAILED -- saving rejects to file src/sysdep.c.rej
> Error: Failure patching nt/cmdproxy.c
> 
> where
> 
> $ cat emacs-master/src/sysdep.c.rej
> --- src/sysdep.c.orig   2022-06-23 20:59:02.252891700 +0200
> +++ src/sysdep.c        2022-06-23 21:05:31.998322600 +0200
> @@ -2704,7 +2706,11 @@
>    if (err | (ADDRESS_SANITIZER
>              ? fflush (stderr) != 0 || ferror (stderr)
>              : close_stream (stderr) != 0))
> +#ifndef _UCRT // XXX: close_stream(stderr) fails for some reason
>      _exit (EXIT_FAILURE);
> +#else
> +    ;
> +#endif
>  }
> 
> 
>  #ifndef DOS_NT
> 
> Maybe you now how this should be fixed...
> 
> TIA

For completeness, the cited patches apply to commit 22d031f644d38e385f422ffc4855385d9052659b but _not_ to commit f2f2e6a082a541c60eb25ad6d30707e111082811 (whose parent is 22d031...)

Re: Emacs master build broken [MSYS2/UCRT64]

[Eli Zaretskii]

> Date: Fri, 18 Aug 2023 23:35:57 +0200 (CEST)
> From: Angelo Graziosi <angelo.g0@libero.it>
> 
> I have built master two day ago on MSYS2/UCRT64 using their patches (https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-emacs).
> 
> Now a recent change (Po Lu f2f2e6a082a541 ?) to src/sysdep.c has broken the build because the MSYS2 people patche does not apply:

Please take this up with the MSYS2 folks: they should update their
patches.  We don't maintain their patches here, and cannot be
responsible for not breaking them as development of Emacs continues.

Re: Emacs master build broken [MSYS2/UCRT64]

[Angelo Graziosi]

> Il 19/08/2023 08:06 CEST Eli Zaretskii ha scritto:
> 
>  
> > Date: Fri, 18 Aug 2023 23:35:57 +0200 (CEST)
> > From: Angelo Graziosi <angelo.g0@libero.it>
> > 
> > I have built master two day ago on MSYS2/UCRT64 using their patches (https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-emacs).
> > 
> > Now a recent change (Po Lu f2f2e6a082a541 ?) to src/sysdep.c has broken the build because the MSYS2 people patche does not apply:
> 
> Please take this up with the MSYS2 folks: they should update their
> patches.  We don't maintain their patches here, and cannot be
> responsible for not breaking them as development of Emacs continues.

I corrected those patches and informed MSYS2 people. Thanks in any case...