Merge pull request #25093 from mbargull/1.26.x-fix-meson-HAVE_FEATURES_H

charris · web-flow · commit 249b5be231ef · 2023-11-11T13:30:04.000-07:00
BLD: Fix features.h detection for Meson builds [1.26.x Backport]
diff --git a/numpy/core/config.h.in b/numpy/core/config.h.in
@@ -12,6 +12,7 @@
 #mesondefine HAVE___DECLSPEC_THREAD_
 
 /* Optional headers */
+#mesondefine HAVE_FEATURES_H
 #mesondefine HAVE_XLOCALE_H
 #mesondefine HAVE_DLFCN_H
 #mesondefine HAVE_EXECINFO_H
diff --git a/numpy/core/src/common/npy_config.h b/numpy/core/src/common/npy_config.h
@@ -160,8 +160,29 @@
 #undef HAVE_CACOSHL
 
 #endif  /* __GLIBC_PREREQ(2, 18) */
-#endif  /* defined(__GLIBC_PREREQ) */
+#else   /* defined(__GLIBC) */
+/* musl linux?, see issue #25092 */
 
+#undef HAVE_CASIN
+#undef HAVE_CASINF
+#undef HAVE_CASINL
+#undef HAVE_CASINH
+#undef HAVE_CASINHF
+#undef HAVE_CASINHL
+#undef HAVE_CATAN
+#undef HAVE_CATANF
+#undef HAVE_CATANL
+#undef HAVE_CATANH
+#undef HAVE_CATANHF
+#undef HAVE_CATANHL
+#undef HAVE_CACOS
+#undef HAVE_CACOSF
+#undef HAVE_CACOSL
+#undef HAVE_CACOSH
+#undef HAVE_CACOSHF
+#undef HAVE_CACOSHL
+
+#endif  /* defined(__GLIBC) */
 #endif  /* defined(HAVE_FEATURES_H) */
 
 #endif  /* NUMPY_CORE_SRC_COMMON_NPY_CONFIG_H_ */
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
@@ -1712,6 +1712,9 @@ def test_arctanh(self):
                     assert_raises(FloatingPointError, np.arctanh,
                                   np.array(value, dtype=dt))
 
+        # Make sure glibc < 2.18 atanh is not used, issue 25087
+        assert np.signbit(np.arctanh(-1j).real)
+
     # See: https://github.com/numpy/numpy/issues/20448
     @pytest.mark.xfail(
         _glibc_older_than("2.17"),
