The second part of the patch is failing:
# patch -p0 < ../uclibc-fenv.patch
patching file numpy/core/include/numpy/ufuncobject.h
patching file numpy/numarray/_capi.c
Hunk #1 FAILED at 224.
Hunk #2 FAILED at 2937.
2 out of 2 hunks FAILED -- saving rejects to file numpy/numarray/_capi.c.rej
#
I attached the .rej file.
-Dave
David M. Cooke wrote:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
David Shepherd wrote:
You know, looking at the core it looks like it has something to do with
the "define(linux)" statement. I am running linux, but its a buildroot
(uclibc) rootfs. Let me know if you need anymore information. Thanks.
Dave
David Shepherd wrote:
Well, I get further into the compile process, but now it fails on
another gcc compile operations. This is essentially the same error
message I was getting before. It tries to #include <fenv.h>, but does
not find it (it shouldn't be including it anyway, as you said). This
time it fails when trying to compile "_capi.c". Thanks for all your
help so far!
Try this updated patch. It replaces the defined(linux) tests with
defined(__GLIBC__).
- --
|>|\/|<
/------------------------------------------------------------------\
|David M. Cooke http://arbutus.physics.mcmaster.ca/dmc/
|[EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGFo8PN9ixZKFWjRQRAsFRAJwKK4pOaxxTUCR71vF3P7R+QMY2dACgsnsY
4xssXvgP96hfEbiOvdSFUUM=
=AT85
-----END PGP SIGNATURE-----
------------------------------------------------------------------------
Index: numpy/core/include/numpy/ufuncobject.h
===================================================================
--- numpy/core/include/numpy/ufuncobject.h (revision 3673)
+++ numpy/core/include/numpy/ufuncobject.h (working copy)
@@ -276,7 +276,7 @@
(void) fpsetsticky(0); \
}
-#elif defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
+#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
#include <fenv.h>
Index: numpy/numarray/_capi.c
===================================================================
--- numpy/numarray/_capi.c (revision 3673)
+++ numpy/numarray/_capi.c (working copy)
@@ -224,7 +224,7 @@
}
/* Likewise for Integer overflows */
-#if defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
#include <fenv.h>
#elif defined(__CYGWIN__)
@@ -2937,7 +2937,7 @@
return retstatus;
}
-#elif defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
+#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
#if defined(__GLIBC__) || defined(darwin) || defined(__MINGW32__)
#include <fenv.h>
#elif defined(__CYGWIN__)
------------------------------------------------------------------------
_______________________________________________
Numpy-discussion mailing list
Numpy-discussion@scipy.org
http://projects.scipy.org/mailman/listinfo/numpy-discussion
***************
*** 224,230 ****
}
/* Likewise for Integer overflows */
- #if defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
#include <fenv.h>
#elif defined(__CYGWIN__)
--- 224,230 ----
}
/* Likewise for Integer overflows */
+ #if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
#include <fenv.h>
#elif defined(__CYGWIN__)
***************
*** 2937,2943 ****
return retstatus;
}
- #elif defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
#if defined(__GLIBC__) || defined(darwin) || defined(__MINGW32__)
#include <fenv.h>
#elif defined(__CYGWIN__)
--- 2937,2943 ----
return retstatus;
}
+ #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__)
#if defined(__GLIBC__) || defined(darwin) || defined(__MINGW32__)
#include <fenv.h>
#elif defined(__CYGWIN__)
_______________________________________________
Numpy-discussion mailing list
Numpy-discussion@scipy.org
http://projects.scipy.org/mailman/listinfo/numpy-discussion
