From: Angelo Graziosi <angelo.g0@libero.it>
To: "emacs-devel@gnu.org" <emacs-devel@gnu.org>
Subject: Re: Emacs master build broken [MSYS2/UCRT64]
Date: Fri, 18 Aug 2023 23:54:12 +0200 (CEST) [thread overview]
Message-ID: <1129078276.7074503.1692395652867@mail1.libero.it> (raw)
In-Reply-To: <971110677.7074324.1692394557584@mail1.libero.it>
> 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...)
next prev parent reply other threads:[~2023-08-18 21:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-18 21:35 Emacs master build broken [MSYS2/UCRT64] Angelo Graziosi
2023-08-18 21:54 ` Angelo Graziosi [this message]
2023-08-19 6:06 ` Eli Zaretskii
2023-08-19 7:44 ` Angelo Graziosi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1129078276.7074503.1692395652867@mail1.libero.it \
--to=angelo.g0@libero.it \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).