diff options
author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2014-02-20 08:03:41 +0000 |
---|---|---|
committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2014-02-20 08:03:41 +0000 |
commit | c8608f042f9a8ac3dd535eed2cf0608add02c928 (patch) | |
tree | baf002ce53c922f4e018c21ce58f3557fe17f461 /math/py-numpy/files | |
parent | Support staging (diff) |
- clean-up WITH_FIXED_FENV conditional, because it is only used for
versions of FreeBSD, we not support anymore.
- remove LATEST_LINK. There is PYTHON_PKGNAMEPREFIX set and in future
we may have this package built against different python versions.
Notes
Notes:
svn path=/head/; revision=345173
Diffstat (limited to 'math/py-numpy/files')
-rw-r--r-- | math/py-numpy/files/fenv.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/math/py-numpy/files/fenv.patch b/math/py-numpy/files/fenv.patch deleted file mode 100644 index 66bedfdd039e..000000000000 --- a/math/py-numpy/files/fenv.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- 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(__FreeBSD__) && (__FreeBSD_version <= 900009) -+#include "fenv/fenv.c" -+#else - #include <fenv.h> -+#endif - #elif defined(__CYGWIN__) - #include "fenv/fenv.c" - #endif ---- 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)) -+#if defined(__FreeBSD__) && (__FreeBSD_version <= 900009) -+#include "numpy/fenv/fenv.h" -+#include "numpy/fenv/fenv.c" -+#else - #include <fenv.h> -+#endif - #elif defined(__CYGWIN__) - #include "numpy/fenv/fenv.h" - #include "numpy/fenv/fenv.c" ---- 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. -- if sys.platform == 'cygwin': -+ if sys.platform == 'cygwin' or sys.platform.startswith('freebsd'): - 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 |