blob: 66bedfdd039e188fd9b8d0d1644b028757ba25d9 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- 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
|