apply 24979.diff

charris · charris · commit de58f45b10d4 · 2023-11-06T09:14:57.000-07:00
diff --git a/numpy/core/meson.build b/numpy/core/meson.build
@@ -257,37 +257,6 @@ foreach filefunc_maybe: optional_file_funcs
   endif
 endforeach
 
-# Optional locale function
-have_strtold_l = cc.has_function('strtold_l', include_directories: inc_curdir,
-  prefix:'''
-  #include <stdlib.h>
-  #include <xlocale.h>
-  #include "feature_detection_locale.h"
-''')
-if not have_strtold_l
-  # Retry with locale.h, seems to vary across Linux distros
-  have_strtold_l = cc.has_function('strtold_l', include_directories: inc_curdir,
-    prefix:'''
-    #include <stdlib.h>
-    #include <locale.h>
-    #include "feature_detection_locale.h"
-  ''')
-endif
-if have_strtold_l
-  cdata.set10('HAVE_STRTOLD_L', true)
-else
-  # FIXME: this is wrong! the HAVE_ define should not exist, or it'll be
-  # interpreted as the function being available (true/false does nothing, see
-  # note on HAVE_ defines higher up). This is necessary though in order to make
-  # the Linux CI job pass. So either the check is wrong somehow, or this
-  # function is not available in CI. For the latter there is a fallback path,
-  # but that is broken because we don't have the exact long double
-  # representation checks.
-  if cc.get_argument_syntax() != 'msvc'
-    cdata.set10('HAVE_STRTOLD_L', false)
-  endif
-endif
-
 # Other optional functions
 optional_misc_funcs = [
   'backtrace',
@@ -305,7 +274,7 @@ endforeach
 # SSE headers only enabled automatically on amd64/x32 builds
 optional_headers = [
   'features.h',   # for glibc version linux
-  'xlocale.h',    # see GH#8367
+  'xlocale.h',    # removed in glibc 2.26, but may still be useful - see gh-8367
   'dlfcn.h',      # dladdr
   'execinfo.h',   # backtrace
   'libunwind.h',  # backtrace for LLVM/Clang using libunwind
@@ -317,6 +286,19 @@ foreach header: optional_headers
   endif
 endforeach
 
+# Optional locale function - GNU-specific
+_strtold_prefix = '''
+#define _GNU_SOURCE
+#include <locale.h>
+#include <stdlib.h>
+'''
+if cdata.get('HAVE_XLOCALE_H', 0) == 1
+  _strtold_prefix += '#include <xlocale.h>'
+endif
+if cc.has_function('strtold_l', include_directories: inc_curdir, prefix: _strtold_prefix)
+  cdata.set10('HAVE_STRTOLD_L', true)
+endif
+
 # Optional compiler attributes
 # TODO: this doesn't work with cc.has_function_attribute, see
 #       https://github.com/mesonbuild/meson/issues/10732
diff --git a/numpy/core/src/common/numpyos.c b/numpy/core/src/common/numpyos.c
@@ -11,6 +11,9 @@
 
 #include "npy_pycompat.h"
 
+#if defined(HAVE_STRTOLD_L) && !defined(_GNU_SOURCE)
+# define _GNU_SOURCE
+#endif
 #include <locale.h>
 #include <stdio.h>
 
