From: Paul Eggert Date: Fri, 16 Feb 2024 02:45:29 +0000 (-0800) Subject: Adjust to yesterday’s Gnulib nstrftime changes X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a814f7036d0c2930eee6463c9d3e76b20e21122;p=emacs.git Adjust to yesterday’s Gnulib nstrftime changes Bruno Haible fixed Gnulib so that nstrftime no longer requires locking code, which means we no longer need to avoid localename. However, nstrftime now requires localename-unsafe-limited which pulls in some Gnulib-specific locale code, and it’s likely this needs to be replaced with Emacs-specific locale code. In the meantime let’s continue to finess this by avoiding localename-unsafe-limited. * admin/merge-gnulib (AVOIDED_MODULES): Avoid localename-unsafe-limited instead of localename. (cherry picked from commit 37bb33dae791e5f59f1d0d27c0221db3b3b4c16d) --- diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 35966852e27..41531d573b0 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -53,7 +53,7 @@ GNULIB_MODULES=' AVOIDED_MODULES=' access btowc chmod close crypto/af_alg dup fchdir fstat - iswblank iswctype iswdigit iswxdigit langinfo localename lock + iswblank iswctype iswdigit iswxdigit langinfo localename-unsafe-limited lock mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo openat-die opendir pthread-h raise save-cwd select setenv sigprocmask stat stdarg