Re: build failures in mingw64

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

On 2023-07-10 05:28, Eli Zaretskii wrote:

> AFAIR, Gnulib-generated configure scripts always check for the French
> locale, for whatever reasons.

The recent patch should cause that to stop happening for Emacs's 
configure script.
> But shouldn't LOCALE_FR_UTF8 be quoted in the below fragment?
> 
>        if test $LOCALE_FR_UTF8 != none; then
>          if test "$cross_compiling" = yes; then :

Quoting should not be necessary, because at that point LOCALE_FR_UTF8's 
value is guaranteed to be safe without quoting.

Come to think of it, that shell script fragment can be optimized away so 
this issue won't even come up. I installed the attached to do that.

[-- Attachment #2: 0001-Further-simplify-configure-time-locale-testing.patch --]
[-- Type: text/x-patch, Size: 2011 bytes --]

From 845ff9563d47568ddd5cb37c62a53deade2d4693 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 10 Jul 2023 09:53:07 -0700
Subject: [PATCH] Further simplify configure-time locale testing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* configure.ac (gl_STDLIB_H): Replace this, not gt_LOCALE_FR_UTF8,
as this lets us also omit MB_CUR_MAX checking that will never be
executed, and also lets us remove testing for ecvt, fcvt, gcvt
that Emacs doesn’t need.
(AC_C_RESTRICT): Invoke explicitly, as Emacs uses ‘restrict’
directly.  Also, simplifies the replacement for gl_STDLIB_H, which
would otherwise need to AC_REQUIRE AC_C_RESTRICT.
* lib/gnulib.mk.in: Regenerate via admin/merge-gnulib.
---
 configure.ac     | 7 ++++---
 lib/gnulib.mk.in | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 890b06905c1..a51aa44cf2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -902,9 +902,9 @@ AC_DEFUN
   [GNULIBHEADERS_OVERRIDE_WINT_T=0
    AC_SUBST([GNULIBHEADERS_OVERRIDE_WINT_T])])
 # Emacs does not need precise checks for the Solaris 10 MB_CUR_MAX bug.
-AC_DEFUN([gt_LOCALE_FR_UTF8],
-  [LOCALE_FR_UTF8=none
-   AC_SUBST([LOCALE_FR_UTF8])])
+AC_DEFUN_ONCE([gl_STDLIB_H],
+  [AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+   gl_NEXT_HEADERS([stdlib.h])])
 
 # Initialize gnulib right after choosing the compiler.
 dnl Amongst other things, this sets AR and ARFLAGS.
@@ -6305,6 +6305,7 @@ AC_DEFUN
      structure to an N-byte boundary.])
 fi
 
+AC_C_RESTRICT
 AC_C_TYPEOF
 
 AC_CACHE_CHECK([for statement expressions],
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index a25bee25aae..3ef36bf8af6 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -961,7 +961,6 @@ LIB_WSOCK32 = @LIB_WSOCK32@
 LIB_XATTR = @LIB_XATTR@
 LIMITS_H = @LIMITS_H@
 LN_S_FILEONLY = @LN_S_FILEONLY@
-LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LTLIBGMP = @LTLIBGMP@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
-- 
2.39.2