forked from pool/python-numpy
Accepting request 142250 from devel:languages:python
- Add numpy-fd15162.patch which should fix python3-scipy
See fd15162fbf
OBS-URL: https://build.opensuse.org/request/show/142250
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=25
This commit is contained in:
parent
597be76d88
commit
a941e61bba
21
numpy-fd15162.patch
Normal file
21
numpy-fd15162.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
Index: numpy-1.6.2/numpy/core/src/multiarray/methods.c
|
||||||
|
===================================================================
|
||||||
|
--- numpy-1.6.2.orig/numpy/core/src/multiarray/methods.c
|
||||||
|
+++ numpy-1.6.2/numpy/core/src/multiarray/methods.c
|
||||||
|
@@ -1476,7 +1476,15 @@ array_setstate(PyArrayObject *self, PyOb
|
||||||
|
if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
|
||||||
|
int swap=!PyArray_ISNOTSWAPPED(self);
|
||||||
|
self->data = datastr;
|
||||||
|
- if (!_IsAligned(self) || swap) {
|
||||||
|
+#ifndef NPY_PY3K
|
||||||
|
+ /* Check that the string is not interned */
|
||||||
|
+ if (!_IsAligned(self) || swap || PyString_CHECK_INTERNED(rawdata)) {
|
||||||
|
+#else
|
||||||
|
+ /* Bytes should always be considered immutable, but we just grab the
|
||||||
|
+ * pointer if they are large, to save memory. */
|
||||||
|
+ if (!_IsAligned(self) || swap || (len <= 1000)) {
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
intp num = PyArray_NBYTES(self);
|
||||||
|
self->data = PyDataMem_NEW(num);
|
||||||
|
if (self->data == NULL) {
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 21 09:31:44 UTC 2012 - idonmez@suse.com
|
||||||
|
|
||||||
|
- Add numpy-fd15162.patch which should fix python3-scipy
|
||||||
|
See https://github.com/numpy/numpy/commit/fd15162fbff5dd68c548284947d39bb2a2481183
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 13 12:23:18 UTC 2012 - idonmez@suse.com
|
Tue Nov 13 12:23:18 UTC 2012 - idonmez@suse.com
|
||||||
|
|
||||||
|
@ -27,6 +27,7 @@ Group: Development/Libraries/Python
|
|||||||
Source: %{modname}-%{version}.tar.gz
|
Source: %{modname}-%{version}.tar.gz
|
||||||
Patch1: numpy-buildfix.patch
|
Patch1: numpy-buildfix.patch
|
||||||
Patch2: numpy-python33.patch
|
Patch2: numpy-python33.patch
|
||||||
|
Patch3: numpy-fd15162.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: blas-devel
|
BuildRequires: blas-devel
|
||||||
BuildRequires: lapack-devel
|
BuildRequires: lapack-devel
|
||||||
@ -88,6 +89,7 @@ This package contains files for developing applications using %{modname}.
|
|||||||
%setup -q -n %{modname}-%{version}
|
%setup -q -n %{modname}-%{version}
|
||||||
%patch1
|
%patch1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
sed -i "1d" %{modname}/{compat/setup{,scons},distutils/{conv_template,cpuinfo,exec_command,from_template,setup,setupscons,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,setupscons,use_rules},ma/setup{,scons},matrixlib/setup{,scons},setup,setupscons,testing/print_coercion_tables,testing/setup{,scons}}.py # Fix non-executable scripts
|
sed -i "1d" %{modname}/{compat/setup{,scons},distutils/{conv_template,cpuinfo,exec_command,from_template,setup,setupscons,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,setupscons,use_rules},ma/setup{,scons},matrixlib/setup{,scons},setup,setupscons,testing/print_coercion_tables,testing/setup{,scons}}.py # Fix non-executable scripts
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user