rpms/numpy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

actually add the patch this time

Browse Source
This commit is contained in:
dmalcolm 2010-07-22 23:31:12 +00:00
parent 395af7feb3
commit 7f4fb22c5b
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
numpy-1.4.1-remove-PyOS_ascii_strtod.patch Normal file
View File

@ -0,0 +1,27 @@
diff -up numpy-1.4.1/numpy/core/src/multiarray/numpyos.c.remove-PyOS_ascii_strtod numpy-1.4.1/numpy/core/src/multiarray/numpyos.c
--- numpy-1.4.1/numpy/core/src/multiarray/numpyos.c.remove-PyOS_ascii_strtod 2010-07-22 19:15:18.846696632 -0400
+++ numpy-1.4.1/numpy/core/src/multiarray/numpyos.c 2010-07-22 19:16:24.454744969 -0400
@@ -506,7 +506,11 @@ NumPyOS_ascii_strtod(const char *s, char
}
memcpy(buffer, s, n);
buffer[n] = '\0';
+#if PY_VERSION_HEX >= 0x02070000
+ result = PyOS_string_to_double(buffer, &q, NULL);
+#else
result = PyOS_ascii_strtod(buffer, &q);
+#endif
if (endptr != NULL) {
*endptr = (char*)(s + (q - buffer));
}
@@ -515,7 +519,11 @@ NumPyOS_ascii_strtod(const char *s, char
}
/* End of ##2 */
+#if PY_VERSION_HEX >= 0x02070000
+ return PyOS_string_to_double(s, endptr, NULL);
+#else
return PyOS_ascii_strtod(s, endptr);
+#endif
}

5
numpy.spec
View File

@ -4,7 +4,7 @@
Name: numpy
Version: 1.4.1
Release: 5%{?dist}
Release: 6%{?dist}
Epoch: 1
Summary: A fast multidimensional array facility for Python
@ -133,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1:1.4.1-6
- actually add the patch this time
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1:1.4.1-5
- fix segfault within %check on 2.7 (patch 2)