Re: [PR PATCH] [Updated] python-numpy: fix for armv5tel-musl.

[fosslinux <fosslinux@users.noreply.github.com>]

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

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages python-matplotlib-fix
https://github.com/void-linux/void-packages/pull/24988

python-numpy: fix for armv5tel-musl.
musl differs from glibc in that it dosen't provide fenv.h, on arm, when it
believes the architecture dosen't use hardware floating point in any
way. While this is mostly correct, numpy dosen't use them for floating
point reasons -- it just uses them as general, as per the code, "normal
GCC" constants. Hence, extract the constants from the file and provide
them to numpy all the time for armv5tel-musl, the only affected arch.

A patch file from https://github.com/void-linux/void-packages/pull/24988.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-matplotlib-fix-24988.patch --]
[-- Type: text/x-diff, Size: 3865 bytes --]

From 8f1baaffbae125a450bfabe6173c7622c580f186 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 20 Sep 2020 18:38:07 +1000
Subject: [PATCH 1/2] python3-numpy: fix armv5tel-musl.

in fenv.h, musl disables the normal set of constants that you would get
on arm with an arm device with an fpu (armv6 and up), but armv5tel on
void uses softfloat all the time. But python3-numpy dosen't use these to
interact with the fpu (the compiler would generate those instructions)
and rather just uses those constants for a generic GCC implementation.
So we give them out anyway.
---
 srcpkgs/python3-numpy/files/fenv-constants.h     | 10 ++++++++++
 srcpkgs/python3-numpy/files/fenv-constants.patch | 11 +++++++++++
 srcpkgs/python3-numpy/template                   |  9 +++++++++
 3 files changed, 30 insertions(+)
 create mode 100644 srcpkgs/python3-numpy/files/fenv-constants.h
 create mode 100644 srcpkgs/python3-numpy/files/fenv-constants.patch

diff --git a/srcpkgs/python3-numpy/files/fenv-constants.h b/srcpkgs/python3-numpy/files/fenv-constants.h
new file mode 100644
index 00000000000..c2c21d2bb23
--- /dev/null
+++ b/srcpkgs/python3-numpy/files/fenv-constants.h
@@ -0,0 +1,10 @@
+#define FE_INVALID    1
+#define FE_DIVBYZERO  2
+#define FE_OVERFLOW   4
+#define FE_UNDERFLOW  8
+#define FE_INEXACT    16
+#define FE_ALL_EXCEPT 31
+#define FE_TONEAREST  0
+#define FE_DOWNWARD   0x800000
+#define FE_UPWARD     0x400000
+#define FE_TOWARDZERO 0xc00000
diff --git a/srcpkgs/python3-numpy/files/fenv-constants.patch b/srcpkgs/python3-numpy/files/fenv-constants.patch
new file mode 100644
index 00000000000..987ad4e346f
--- /dev/null
+++ b/srcpkgs/python3-numpy/files/fenv-constants.patch
@@ -0,0 +1,11 @@
+--- numpy/core/src/npymath/ieee754.c.src	2020-09-20 14:53:51.998825328 +1000
++++ numpy/core/src/npymath/ieee754.c.src	2020-09-20 14:54:03.611889518 +1000
+@@ -8,6 +8,8 @@
+ #include "npy_math_private.h"
+ #include "numpy/utils.h"
+ 
++#include "fenv-constants.h"
++
+ #ifndef HAVE_COPYSIGN
+ double npy_copysign(double x, double y)
+ {
diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 759899d8e7b..c14d7381e67 100644
--- a/srcpkgs/python3-numpy/template
+++ b/srcpkgs/python3-numpy/template
@@ -16,6 +16,15 @@ distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
 checksum=5ee0d6d17fe01dde9824811516d94ba8adb9349d81ef78d0696e6b03097498b8
 alternatives="numpy:f2py:/usr/bin/f2py3"
 
+post_patch() {
+	case "${XBPS_TARGET_MACHINE}" in
+		armv5tel-musl)
+			cp "${FILESDIR}/fenv-constants.h" numpy/core/src/npymath/
+			patch -Np0 -i "${FILESDIR}/fenv-constants.patch"
+			;;
+	esac
+}
+
 do_check() {
 	./runtests.py -v
 }

From dfb16218c7452c1ea52ed719fa4d442f17600f8f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 20 Sep 2020 18:39:51 +1000
Subject: [PATCH 2/2] python-numpy: fix armv5tel-musl.

Uses the same patch and file from python3-numpy so we just use that from
python3-numpy's files directory.
---
 srcpkgs/python-numpy/template | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/srcpkgs/python-numpy/template b/srcpkgs/python-numpy/template
index 52308fd2aa6..df6c2389add 100644
--- a/srcpkgs/python-numpy/template
+++ b/srcpkgs/python-numpy/template
@@ -15,6 +15,17 @@ distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
 checksum=3c82a9b8616e3096a79a2af9c288d8ed4013a10fc7baf3eaf54655309734dadd
 alternatives="numpy:f2py:/usr/bin/f2py2"
 
+post_patch() {
+	case "${XBPS_TARGET_MACHINE}" in
+		armv5tel-musl)
+			cp "${XBPS_SRCPKGDIR}/python3-numpy/files/fenv-constants.h" \
+                numpy/core/src/npymath/
+			patch -Np0 -i \
+                "${XBPS_SRCPKGDIR}/python3-numpy/files/fenv-constants.patch"
+			;;
+	esac
+}
+
 post_install() {
 	# create compat symlinks for .h files
 	vmkdir ${py2_inc}