Increase FuncCastEmulation NUM_PARAMS further

bus3297 · Nov 15, 2018 · 56e8a17 · 56e8a17
1 parent 27319bc
commit 56e8a17
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 80 deletions.
diff --git a/emsdk/patches/num_params.patch b/emsdk/patches/num_params.patch
@@ -7,7 +7,7 @@ index 013e9403..d95fc282 100644
  // to match when dynamically linking, and also dynamic linking is why we
  // can't just detect this automatically in the module we see.)
 -static const int NUM_PARAMS = 15;
-+static const int NUM_PARAMS = 45;
++static const int NUM_PARAMS = 61;   // needed by scipy.odr._odrpack
 
  // Converts a value to the ABI type of i64.
  static Expression* toABI(Expression* value, Module* module) {
diff --git a/packages/scipy/meta.yaml b/packages/scipy/meta.yaml
@@ -21,7 +21,6 @@ source:
     - patches/force_malloc.patch
     - patches/disable_scipy_stats_mvn.patch
     - patches/skip-fortran-fails-to-link.patch
-    - patches/disable_FuncCastEmulation_num_params.patch
 
 build:
   cflags: -I../../CLAPACK-WA/INCLUDE -Wno-implicit-function-declaration

diff --git a/packages/scipy/patches/disable_FuncCastEmulation_num_params.patch b/packages/scipy/patches/disable_FuncCastEmulation_num_params.patch
diff --git a/test/conftest.py b/test/conftest.py
@@ -17,7 +17,6 @@
 BUILD_PATH = TEST_PATH / '..' / 'build'
 
 sys.path.append(str(TEST_PATH / '..'))
-print(sys.path)
 
 from pyodide_build._fixes import _selenium_is_connectable  # noqa: E402
 import selenium.webdriver.common.utils  # noqa: E402