New build (#508)
* fix build for openssl 1.1.1b required for sdk (cherry picked from commit aa49e3b2755b97b6331cdbbb89efc954de8d5977) * use js code from master * fix openssl recipe and tweak build (cherry picked from commit 6e94c27021c7bd7b1e880c2fc314850e36a5a38e) * remove unused build recipes (cherry picked from commit f5c0577bdb175bfc0990602936bbc9e2052e1f25)
This commit is contained in:
parent
f853132e9b
commit
8b2694efb7
340 changed files with 12797 additions and 5034 deletions
p4a/pythonforandroid/recipes/numpy/patches
|
@ -1,49 +1,17 @@
|
|||
diff --git a/numpy/core/src/multiarray/numpyos.c b/numpy/core/src/multiarray/numpyos.c
|
||||
index 44b32f4..378e199 100644
|
||||
--- a/numpy/core/src/multiarray/numpyos.c
|
||||
+++ b/numpy/core/src/multiarray/numpyos.c
|
||||
@@ -165,8 +165,7 @@ ensure_decimal_point(char* buffer, size_t buf_size)
|
||||
static void
|
||||
change_decimal_from_locale_to_dot(char* buffer)
|
||||
{
|
||||
- struct lconv *locale_data = localeconv();
|
||||
- const char *decimal_point = locale_data->decimal_point;
|
||||
+ const char *decimal_point = ".";
|
||||
|
||||
if (decimal_point[0] != '.' || decimal_point[1] != 0) {
|
||||
size_t decimal_point_len = strlen(decimal_point);
|
||||
@@ -448,8 +447,7 @@ NumPyOS_ascii_strtod_plain(const char *s, char** endptr)
|
||||
NPY_NO_EXPORT double
|
||||
NumPyOS_ascii_strtod(const char *s, char** endptr)
|
||||
{
|
||||
- struct lconv *locale_data = localeconv();
|
||||
- const char *decimal_point = locale_data->decimal_point;
|
||||
+ const char *decimal_point = ".";
|
||||
size_t decimal_point_len = strlen(decimal_point);
|
||||
|
||||
char buffer[FLOAT_FORMATBUFLEN+1];
|
||||
diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h
|
||||
index f768c90..4e5d168 100644
|
||||
--- a/numpy/core/src/private/npy_config.h
|
||||
+++ b/numpy/core/src/private/npy_config.h
|
||||
@@ -41,4 +41,10 @@
|
||||
#undef HAVE_ATAN2
|
||||
#endif
|
||||
|
||||
+/* Android only */
|
||||
+#ifdef ANDROID
|
||||
+#undef HAVE_LDEXPL
|
||||
+#undef HAVE_FREXPL
|
||||
+#endif
|
||||
+
|
||||
#endif
|
||||
diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py
|
||||
index 258cbe9..ce4e0eb 100644
|
||||
index a7c8593..007ce26 100644
|
||||
--- a/numpy/testing/__init__.py
|
||||
+++ b/numpy/testing/__init__.py
|
||||
@@ -1,16 +1,7 @@
|
||||
@@ -1,22 +1,8 @@
|
||||
-"""Common test support for all numpy test scripts.
|
||||
-
|
||||
+# fake tester, android don't have unittest
|
||||
+class Tester(object):
|
||||
+ def test(self, *args, **kwargs):
|
||||
+ pass
|
||||
+ def bench(self, *args, **kwargs):
|
||||
+ pass
|
||||
+test = Tester().test
|
||||
|
||||
-This single module should provide all the common functionality for numpy tests
|
||||
-in a single location, so that test scripts can just import it and work right
|
||||
-away.
|
||||
|
@ -53,14 +21,14 @@ index 258cbe9..ce4e0eb 100644
|
|||
-
|
||||
-from unittest import TestCase
|
||||
-
|
||||
-from . import decorators as dec
|
||||
-from .utils import *
|
||||
-from .nosetester import NoseTester as Tester
|
||||
-from .nosetester import run_module_suite
|
||||
+# fake tester, android don't have unittest
|
||||
+class Tester(object):
|
||||
+ def test(self, *args, **kwargs):
|
||||
+ pass
|
||||
+ def bench(self, *args, **kwargs):
|
||||
+ pass
|
||||
test = Tester().test
|
||||
-from ._private.utils import *
|
||||
-from ._private import decorators as dec
|
||||
-from ._private.nosetester import (
|
||||
- run_module_suite, NoseTester as Tester
|
||||
- )
|
||||
-
|
||||
-__all__ = _private.utils.__all__ + ['TestCase', 'run_module_suite']
|
||||
-
|
||||
-from ._private.pytesttester import PytestTester
|
||||
-test = PytestTester(__name__)
|
||||
-del PytestTester
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue