Merge pull request #3307 from rgommers/fix-bento-build

BLD: fix Bento build after umath_linalg move from core to linalg module.

4 files changed, 34 insertions, 29 deletions

diff --git a/bscript b/bscript
index 73d7896da..983476533 100644
--- a/bscript
+++ b/bscript
@@ -18,6 +18,12 @@ import subprocess
 import __builtin__
 __builtin__.__NUMPY_SETUP__ = True
 
+import waflib
+
+from numpy.distutils.conv_template \
+    import \
+        process_str as process_c_str
+
 from bento.commands import hooks
 from bento.utils.utils \
     import \
@@ -81,3 +87,25 @@ def pre_sdist(context):
 @hooks.options
 def options(global_context):
     blas_lapack.add_options(global_context)
+
+
+class CTemplateTask(waflib.Task.Task):
+    color = 'BLUE'
+    before = ['c']
+    def run(self):
+        s = self.inputs[0]
+        cnt = s.read()
+        writestr = process_c_str(cnt)
+        o = self.outputs[0]
+        o.write(writestr)
+
+@waflib.TaskGen.extension(".src")
+def c_template(self, node):
+    outs = []
+    outs.append(node.change_ext(""))
+
+    tsk = self.create_task('CTemplateTask', node, outs)
+    if "c" in self.features:
+        self.source.append(outs[0])
+
+
diff --git a/numpy/core/bscript b/numpy/core/bscript
index 3a2bb2340..44f7f14f0 100644
--- a/numpy/core/bscript
+++ b/numpy/core/bscript
@@ -15,9 +15,6 @@ waflib.Logs.verbose = 1
 # context.
 import numpy.build_utils.waf
 
-from numpy.distutils.conv_template \
-    import \
-        process_str as process_c_str
 from code_generators.numpy_api \
     import \
         multiarray_api, ufunc_api
@@ -325,25 +322,6 @@ def post_configure(context):
     # FIXME: Should be handled in bento context
     conf.store()
 
-class CTemplateTask(waflib.Task.Task):
-    color = 'BLUE'
-    before = ['c']
-    def run(self):
-        s = self.inputs[0]
-        cnt = s.read()
-        writestr = process_c_str(cnt)
-        o = self.outputs[0]
-        o.write(writestr)
-
-@waflib.TaskGen.extension(".src")
-def c_template(self, node):
-    outs = []
-    outs.append(node.change_ext(""))
-
-    tsk = self.create_task('CTemplateTask', node, outs)
-    if "c" in self.features:
-        self.source.append(outs[0])
-
 class numpy_api_generator(Task):
     vars = ["API_TUPLE"]
     color = "BLUE"
diff --git a/numpy/linalg/bento.info b/numpy/linalg/bento.info
index 1c2c180da..52d036753 100644
--- a/numpy/linalg/bento.info
+++ b/numpy/linalg/bento.info
@@ -1,7 +1,7 @@
 HookFile: bscript
 
 Library:
-    Extension: umath_linalg
+    Extension: _umath_linalg
         Sources:
             umath_linalg.c.src,
             lapack_lite/blas_lite.c,
diff --git a/numpy/linalg/bscript b/numpy/linalg/bscript
index dc275f085..deed4fd72 100644
--- a/numpy/linalg/bscript
+++ b/numpy/linalg/bscript
@@ -1,5 +1,3 @@
-import os
-
 from bento.commands.hooks \
     import \
         pre_build
@@ -10,18 +8,19 @@ def pbuild(context):
 
     def build_lapack_lite(extension):
         kw = {}
-        kw["uselib"] = "npymath"
+        kw["use"] = "npymath"
         if bld.env.HAS_LAPACK:
             for s in ['python_xerbla.c', 'zlapack_lite.c', 'dlapack_lite.c',
                       'blas_lite.c', 'dlamch.c', 'f2c_lite.c']:
-                extension.sources.pop(extension.sources.index(s))
-            kw["uselib"] = "npymath LAPACK"
+                extension.sources.pop(extension.sources.index('lapack_lite/' + s))
+            kw["use"] = "npymath LAPACK"
 
         includes = ["../core/include", "../core/include/numpy", "../core",
                     "../core/src/private"]
         return context.default_builder(extension,
                                        includes=includes,
                                        **kw)
+ 
     context.register_builder("lapack_lite", build_lapack_lite)
-    context.register_builder("umath_linalg", build_lapack_lite)
+    context.register_builder("_umath_linalg", build_lapack_lite)