summaryrefslogtreecommitdiff
path: root/math/py-numpy/files
diff options
context:
space:
mode:
authorWen Heping <wen@FreeBSD.org>2011-12-09 08:01:13 +0000
committerWen Heping <wen@FreeBSD.org>2011-12-09 08:01:13 +0000
commiteac732e354288e715ad721265155bdca5307cb54 (patch)
treedcc7aa26b80bdac61c87b2eb14b2b1e62b514238 /math/py-numpy/files
parent- Update to 1.7.3 (diff)
- Update to 1.6.1
PR: 162894 Submitted by: Gereon Kaiping <kta1c10!gereon@linta.de> Approved by: "Li-Lun Leland Wang" <llwang@infor.org> (maintainer) Feature safe: yes
Notes
Notes: svn path=/head/; revision=287099
Diffstat (limited to 'math/py-numpy/files')
-rw-r--r--math/py-numpy/files/fenv.patch48
-rw-r--r--math/py-numpy/files/patch-numpy-distutils-system_info.py19
2 files changed, 41 insertions, 26 deletions
diff --git a/math/py-numpy/files/fenv.patch b/math/py-numpy/files/fenv.patch
index 3a5e915c5b5e..66bedfdd039e 100644
--- a/math/py-numpy/files/fenv.patch
+++ b/math/py-numpy/files/fenv.patch
@@ -1,9 +1,9 @@
---- numpy/core/include/numpy/ufuncobject.h.orig 2009-12-15 06:47:53.000000000 -0600
-+++ numpy/core/include/numpy/ufuncobject.h 2010-02-15 18:54:28.490863602 -0600
-@@ -306,7 +306,11 @@
- #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+--- numpy/core/include/numpy/ufuncobject.h.orig 2011-07-20 13:25:27.000000000 -0500
++++ numpy/core/include/numpy/ufuncobject.h 2011-12-07 20:42:53.811178415 -0600
+@@ -229,7 +229,11 @@
- #if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || defined(__FreeBSD__)
+ #if defined(__GLIBC__) || defined(__APPLE__) || \
+ defined(__MINGW32__) || defined(__FreeBSD__)
+#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009)
+#include "fenv/fenv.c"
+#else
@@ -12,9 +12,9 @@
#elif defined(__CYGWIN__)
#include "fenv/fenv.c"
#endif
---- numpy/numarray/_capi.c.orig 2009-12-28 08:00:09.000000000 -0600
-+++ numpy/numarray/_capi.c 2010-02-15 18:57:25.993127759 -0600
-@@ -9,7 +9,12 @@
+--- numpy/numarray/_capi.c.orig 2010-11-21 01:34:43.000000000 -0600
++++ numpy/numarray/_capi.c 2011-12-07 20:45:35.038394561 -0600
+@@ -10,7 +10,12 @@
#endif
#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
@@ -27,9 +27,20 @@
#elif defined(__CYGWIN__)
#include "numpy/fenv/fenv.h"
#include "numpy/fenv/fenv.c"
---- numpy/core/setup.py.orig 2009-12-28 08:00:09.000000000 -0600
-+++ numpy/core/setup.py 2010-02-15 19:00:44.715666850 -0600
-@@ -625,7 +625,7 @@
+--- numpy/core/setupscons.py.orig 2010-11-21 01:34:42.000000000 -0600
++++ numpy/core/setupscons.py 2011-12-07 21:48:34.674089097 -0600
+@@ -98,7 +98,7 @@
+ config.numpy_include_dirs.extend(config.paths('include'))
+
+ # Don't install fenv unless we need them.
+- if sys.platform == 'cygwin':
++ if sys.platform == 'cygwin' or sys.platform.startswith('freebsd'):
+ config.add_data_dir('include/numpy/fenv')
+
+ config.add_data_dir('tests')
+--- numpy/core/setup.py.orig 2011-07-20 13:25:27.000000000 -0500
++++ numpy/core/setup.py 2011-12-07 21:48:51.360904277 -0600
+@@ -664,7 +664,7 @@
]
# Don't install fenv unless we need them.
@@ -38,3 +49,18 @@
config.add_data_dir('include/numpy/fenv')
config.add_extension('_sort',
+--- numpy/core/src/npymath/ieee754.c.src.orig 2011-03-10 23:56:15.000000000 -0600
++++ numpy/core/src/npymath/ieee754.c.src 2011-12-07 20:52:14.671971546 -0600
+@@ -585,7 +585,11 @@
+
+ # if defined(__GLIBC__) || defined(__APPLE__) || \
+ defined(__MINGW32__) || defined(__FreeBSD__)
+-# include <fenv.h>
++# if defined(__FreeBSD__) && (__FreeBSD_version <= 900009)
++# include "numpy/fenv/fenv.h"
++# else
++# include <fenv.h>
++# endif
+ # elif defined(__CYGWIN__)
+ # include "fenv/fenv.c"
+ # endif
diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py
index 6b8841e0183c..8f3279bb63ee 100644
--- a/math/py-numpy/files/patch-numpy-distutils-system_info.py
+++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py
@@ -1,6 +1,6 @@
---- numpy/distutils/system_info.py.orig 2010-11-18 05:11:51.000000000 -0600
-+++ numpy/distutils/system_info.py 2011-10-08 11:34:44.399179056 -0500
-@@ -909,8 +909,8 @@
+--- numpy/distutils/system_info.py.orig 2011-07-01 22:31:13.000000000 +0100
++++ numpy/distutils/system_info.py 2011-11-26 09:54:54.000000000 +0000
+@@ -910,8 +910,8 @@
dir_env_var = 'ATLAS'
_lib_names = ['f77blas','cblas']
if sys.platform[:7]=='freebsd':
@@ -11,7 +11,7 @@
else:
_lib_atlas = ['atlas']
_lib_lapack = ['lapack']
-@@ -938,6 +938,7 @@
+@@ -939,6 +939,7 @@
atlas = self.check_libs2(d,atlas_libs,[])
lapack_atlas = self.check_libs2(d,['lapack_atlas'],[])
if atlas is not None:
@@ -19,14 +19,3 @@
lib_dirs2 = [d] + self.combine_paths(d,['atlas*','ATLAS*'])
for d2 in lib_dirs2:
lapack = self.check_libs2(d2,lapack_libs,[])
-@@ -1383,8 +1384,9 @@
- atlas_info = get_info('atlas_blas')
- atlas_version = None
- need_blas = 0
-+ lapack_type = self.cp.get(self.section, 'lapack_type').strip()
- info = {}
-- if atlas_info:
-+ if lapack_type == 'atlas' and atlas_info:
- version_info = atlas_info.copy()
- atlas_version = get_atlas_version(**version_info)
- if 'define_macros' not in atlas_info: \ No newline at end of file