More patches

packages/scipy/meta.yaml

@@ -12,13 +12,18 @@ source:
   sha256: bf22383d9e2526ffdc53a6c7d3d66dab45a86291ed35d8e281bd1a5d2c34187b
 
   patches:
+    # these patches can be found as commits in
+    #    https://github.com/rth/scipy/tree/0.17.1-pyodide
+    # on top of the v0.17.1 tag
     - patches/disable_modules_with_blas.patch
     - patches/disable_modules_global_cpp_namespace_issue.patch
     - patches/fix-build-gcc5-a80460.patch
     - patches/force_malloc.patch
+    - patches/disable_scipy_stats_mvn.patch
+    - patches/skip-scipy-special-_ufuncs.patch
 
 build:
-  cflags: -I../../CLAPACK-WA/F2CLIBS/libf2c/ -Wno-implicit-function-declaration
+  cflags: -I/home/rth/src/pyodide/packages/scipy/CLAPACK-WA/INCLUDE -Wno-implicit-function-declaration
   cxxflags:
 
 requirements:

packages/scipy/patches/disable_scipy_stats_mvn.patch

+commit fcf3b0c9e36e81ed52a7ad4eab7497b2e8322759
+Author: Roman Yurchak <rth.yurchak@pm.me>
+Date:   Wed Oct 10 14:47:12 2018 +0200
+
+    Disable scipy.stats.mvn
+
+diff --git a/scipy/stats/setup.py b/scipy/stats/setup.py
+index f1a02df4e..7366ec12d 100755
+--- a/scipy/stats/setup.py
++++ b/scipy/stats/setup.py
+@@ -32,9 +32,9 @@ def configuration(parent_package='',top_path=None):
+     )
+ 
+     # add mvn module
+-    config.add_extension('mvn',
+-        sources=['mvn.pyf','mvndst.f'],
+-    )
++    #config.add_extension('mvn',
++    #    sources=['mvn.pyf','mvndst.f'],
++    #)
+ 
+     return config
+ 

packages/scipy/patches/skip-scipy-special-_ufuncs.patch

+commit 066faced67d1d0a8a4a89588194fcbd2faa0a525
+Author: Roman Yurchak <rth.yurchak@pm.me>
+Date:   Wed Oct 10 17:48:17 2018 +0200
+
+    Skip scipy.special._ufuncs
+
+diff --git a/scipy/special/__init__.py b/scipy/special/__init__.py
+index f013b818e..ab4956825 100644
+--- a/scipy/special/__init__.py
++++ b/scipy/special/__init__.py
+@@ -624,7 +624,11 @@ Convenience Functions
+ 
+ from __future__ import division, print_function, absolute_import
+ 
+-from ._ufuncs import *
++try:
++    from ._ufuncs import *
++except ImportError:
++    # TODO
++    pass
+ 
+ from .basic import *
+ from . import specfun
+diff --git a/scipy/special/_ellip_harm.py b/scipy/special/_ellip_harm.py
+index 6972c2ad1..0558ee6d3 100644
+--- a/scipy/special/_ellip_harm.py
++++ b/scipy/special/_ellip_harm.py
+@@ -3,7 +3,11 @@ from __future__ import division, print_function, absolute_import
+ import threading
+ import numpy as np
+ 
+-from ._ufuncs import _ellip_harm
++try:
++    from ._ufuncs import _ellip_harm
++except ImportError:
++    # TODO
++    pass
+ from ._ellip_harm_2 import _ellipsoid, _ellipsoid_norm
+ 
+ 
+diff --git a/scipy/special/basic.py b/scipy/special/basic.py
+index bb251e745..f1c788c3d 100644
+--- a/scipy/special/basic.py
++++ b/scipy/special/basic.py
+@@ -11,9 +11,13 @@ from scipy._lib.six import xrange
+ from numpy import (pi, asarray, floor, isscalar, iscomplex, real, imag, sqrt,
+                    where, mgrid, sin, place, issubdtype, extract,
+                    less, inexact, nan, zeros, atleast_1d, sinc)
+-from ._ufuncs import (ellipkm1, mathieu_a, mathieu_b, iv, jv, gamma, psi, zeta,
+-                      hankel1, hankel2, yv, kv, gammaln, ndtri, errprint, poch,
+-                      binom)
++try:
++    from ._ufuncs import (ellipkm1, mathieu_a, mathieu_b, iv, jv, gamma, psi, zeta,
++                          hankel1, hankel2, yv, kv, gammaln, ndtri, errprint, poch,
++                          binom)
++except ImportError:
++    # TODO
++    pass
+ from . import specfun
+ from . import orthogonal
+ 
+diff --git a/scipy/special/lambertw.py b/scipy/special/lambertw.py
+index 4bdac30f9..8a890ce51 100644
+--- a/scipy/special/lambertw.py
++++ b/scipy/special/lambertw.py
+@@ -1,6 +1,10 @@
+ from __future__ import division, print_function, absolute_import
+ 
+-from ._ufuncs import _lambertw
++try:
++    from ._ufuncs import _lambertw
++except ImportError:
++    # TODO
++    pass
+ 
+ 
+ def lambertw(z, k=0, tol=1e-8):
+diff --git a/scipy/special/orthogonal.py b/scipy/special/orthogonal.py
+index c2b8dead3..b33ab96ac 100755
+--- a/scipy/special/orthogonal.py
++++ b/scipy/special/orthogonal.py
+@@ -102,8 +102,12 @@ from scipy import linalg
+ from scipy.special import airy
+ 
+ # Local imports.
+-from . import _ufuncs as cephes
+-_gam = cephes.gamma
++try:
++    from . import _ufuncs as cephes
++    _gam = cephes.gamma
++except ImportError:
++    # TODO
++    pass
+ from . import specfun
+ 
+ __all__ = ['legendre', 'chebyt', 'chebyu', 'chebyc', 'chebys',
+@@ -1657,8 +1661,12 @@ def sh_legendre(n, monic=False):
+ # -----------------------------------------------------------------------------
+ # Vectorized functions for evaluation
+ # -----------------------------------------------------------------------------
+-from ._ufuncs import (binom, eval_jacobi, eval_sh_jacobi, eval_gegenbauer,
+-                      eval_chebyt, eval_chebyu, eval_chebys, eval_chebyc,
+-                      eval_sh_chebyt, eval_sh_chebyu, eval_legendre,
+-                      eval_sh_legendre, eval_genlaguerre, eval_laguerre,
+-                      eval_hermite, eval_hermitenorm)
++try:
++    from ._ufuncs import (binom, eval_jacobi, eval_sh_jacobi, eval_gegenbauer,
++                          eval_chebyt, eval_chebyu, eval_chebys, eval_chebyc,
++                          eval_sh_chebyt, eval_sh_chebyu, eval_legendre,
++                          eval_sh_legendre, eval_genlaguerre, eval_laguerre,
++                          eval_hermite, eval_hermitenorm)
++except ImportError:
++    # TODO
++    pass

pyodide_build/buildpkg.py

@@ -154,7 +154,7 @@ def build_package(path, args):
     os.chdir(dirpath)
     try:
         buildpath = dirpath / 'build'
-        if not buildpath.is_dir():
+        if not buildpath.resolve().is_dir():
             os.makedirs(buildpath)
         srcpath = download_and_extract(buildpath, packagedir, pkg, args)
         patch(path, srcpath, pkg, args)