diff options
| author | mattip <matti.picus@gmail.com> | 2022-12-25 15:59:11 +0200 |
|---|---|---|
| committer | mattip <matti.picus@gmail.com> | 2022-12-25 17:17:15 +0200 |
| commit | c29b0e0214b36c4f9ebd0a4b192354f6d812fda0 (patch) | |
| tree | efaef29e03428269dc1bda2c948e1d4de5ef4ea9 | |
| parent | ed7efc7bda3d6d69fc1ca246a82bd79e4934b530 (diff) | |
| download | numpy-c29b0e0214b36c4f9ebd0a4b192354f6d812fda0.tar.gz | |
revert detection for meson.build
| -rw-r--r-- | numpy/core/config.h.in | 19 | ||||
| -rw-r--r-- | numpy/core/meson.build | 6 |
2 files changed, 24 insertions, 1 deletions
diff --git a/numpy/core/config.h.in b/numpy/core/config.h.in index a47968a7d..943a90cc8 100644 --- a/numpy/core/config.h.in +++ b/numpy/core/config.h.in @@ -90,6 +90,25 @@ #mesondefine HAVE_CLOGL #mesondefine HAVE_CPOWL #mesondefine HAVE_CSQRTL +/* FreeBSD */ +#mesondefine HAVE_CSINF +#mesondefine HAVE_CSINHF +#mesondefine HAVE_CCOSF +#mesondefine HAVE_CCOSHF +#mesondefine HAVE_CTANF +#mesondefine HAVE_CTANHF +#mesondefine HAVE_CSIN +#mesondefine HAVE_CSINH +#mesondefine HAVE_CCOS +#mesondefine HAVE_CCOSH +#mesondefine HAVE_CTAN +#mesondefine HAVE_CTANH +#mesondefine HAVE_CSINL +#mesondefine HAVE_CSINHL +#mesondefine HAVE_CCOSL +#mesondefine HAVE_CCOSHL +#mesondefine HAVE_CTANL +#mesondefine HAVE_CTANHL #mesondefine NPY_CAN_LINK_SVML #mesondefine NPY_RELAXED_STRIDES_DEBUG diff --git a/numpy/core/meson.build b/numpy/core/meson.build index bab33991b..d6f9c8ff4 100644 --- a/numpy/core/meson.build +++ b/numpy/core/meson.build @@ -147,7 +147,11 @@ endforeach c99_complex_funcs = [ 'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan', - 'catanh', 'cexp', 'clog', 'cpow', 'csqrt' + 'catanh', 'cexp', 'clog', 'cpow', 'csqrt', + # The long double variants (like csinl) should be mandatory on C11, + # but are missing in FreeBSD. Issue gh-22850 + 'csin', 'csinh', 'ccos', 'ccosh', 'ctan', 'ctanh', + ] foreach func: c99_complex_funcs func_single = func + 'f' |