aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Duchateau <olivierd@FreeBSD.org>2015-10-12 14:19:17 +0000
committerOlivier Duchateau <olivierd@FreeBSD.org>2015-10-12 14:19:17 +0000
commitf371e1d5513d34423c3e86abc0cc9aed3433a91a (patch)
tree140a8562fd46d021c161d25872eddb58bec93192
parent757f542ef2de4054a83f42aa584613f5c4591bda (diff)
downloadports-f371e1d5513d34423c3e86abc0cc9aed3433a91a.tar.gz
ports-f371e1d5513d34423c3e86abc0cc9aed3433a91a.zip
Unbreak build on FreeBSD 9
Reported by: pkg-fallout, <soralx@cydem.org> (private email)
Notes
Notes: svn path=/head/; revision=399131
-rw-r--r--math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src36
1 files changed, 36 insertions, 0 deletions
diff --git a/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src b/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src
new file mode 100644
index 000000000000..d564148f08af
--- /dev/null
+++ b/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src
@@ -0,0 +1,36 @@
+Revert changes in revision c15f774, "remove a bunch of compiler warnings"
+
+--- numpy/core/src/npymath/npy_math_complex.c.src.orig 2015-08-11 17:03:43 UTC
++++ numpy/core/src/npymath/npy_math_complex.c.src
+@@ -33,13 +33,12 @@
+ */
+ #include "npy_math_common.h"
+ #include "npy_math_private.h"
+-#include <numpy/utils.h>
+
+
+ #define raise_inexact() do { volatile npy_float junk = 1 + tiny; } while(0)
+
+
+-static __COMP_NPY_UNUSED npy_float tiny = 3.9443045e-31f;
++static npy_float tiny = 3.9443045e-31f;
+
+
+ /**begin repeat
+@@ -184,8 +183,6 @@ npy_carg@c@(@ctype@ z)
+ #define SCALED_CEXP_LOWERL 11357.216553474703895L
+ #define SCALED_CEXP_UPPERL 22756.021937783004509L
+
+-#ifndef HAVE_CEXP@C@
+-
+ static
+ @ctype@
+ _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt)
+@@ -212,6 +209,7 @@ _npy_scaled_cexp@c@(@type@ x, @type@ y,
+ npy_ldexp@c@(mant * mantsin, expt + exsin));
+ }
+
++#ifndef HAVE_CEXP@C@
+ @ctype@
+ npy_cexp@c@(@ctype@ z)
+ {