Switched back to lapack/blas for conda build.

Author: lorenzwidmer

sunode/build_cvodes.py

@@ -18,14 +18,14 @@
 headers = common + linsolve + cvodes
 include = []
 library_dirs = []
+extra_libs = []
 
 if sys.platform == 'win32':
     with open(os.path.join(base, "source_cvodes_win.c")) as fsource:
         source_content = fsource.read()
-    include.append(os.path.join(os.environ["CONDA_PREFIX"], "Library", "include"))
-    library_dirs.append(os.path.join(os.environ["CONDA_PREFIX"], "Library", "lib"))
+    include += [os.path.join(os.environ["CONDA_PREFIX"], "Library", "include")]
+    library_dirs += [os.path.join(os.environ["CONDA_PREFIX"], "Library", "lib")]
 
-    extra_libs = []
     # lapackdense is not supported by the windows build of sundials
     for name in ['sunlinsol_lapackdense', 'sunlinsol_klu']:
         headers = [fn for fn in headers if name not in fn]
@@ -35,13 +35,14 @@
 
     #test if we can use conda libraries
     if "CONDA_PREFIX" in os.environ:
-        include.append(os.path.join(os.environ["CONDA_PREFIX"], "include"))
-        library_dirs.append(os.path.join(os.environ["CONDA_PREFIX"], "lib"))
+        include += [os.path.join(os.environ["CONDA_PREFIX"], "include")]
+        library_dirs += [os.path.join(os.environ["CONDA_PREFIX"], "lib")]
+        extra_libs += ["blas", "lapack"]
     else:
-        include.append("/usr/include/suitesparse/")    
+        include += ["/usr/include/suitesparse/"]
+        extra_libs.append("openblas")    
 
-    extra_libs = [
-        "openblas",
+    extra_libs += [
         "pthread",
         "klu",
         "sundials_sunlinsollapackdense",