[Numpy-svn] r5304 - trunk/numpy/core

numpy-svn@scip... numpy-svn@scip...
Sat Jun 21 06:08:46 CDT 2008


Author: cdavid
Date: 2008-06-21 06:08:37 -0500 (Sat, 21 Jun 2008)
New Revision: 5304

Modified:
   trunk/numpy/core/SConscript
Log:
Temporary workaround for a numscons bug.

Modified: trunk/numpy/core/SConscript
===================================================================
--- trunk/numpy/core/SConscript	2008-06-20 18:24:10 UTC (rev 5303)
+++ trunk/numpy/core/SConscript	2008-06-21 11:08:37 UTC (rev 5304)
@@ -263,5 +263,12 @@
 #----------------------
 if build_blasdot:
     dotblas_src = [pjoin('blasdot', i) for i in ['_dotblas.c']]
-    dotblas = env.DistutilsPythonExtension('_dotblas', source = dotblas_src)
-    env.Depends(dotblas, pjoin("blasdot", "cblas.h"))
+    # because _dotblas does #include CBLAS_HEADER instead of #include
+    # "cblas.h", scons does not detect the dependency
+    # XXX: PythonExtension builder does not take the Depends on extension into
+    # account for some reason, so we first build the object, with forced
+    # dependency, and then builds the extension. This is more likely a bug in
+    # our PythonExtension builder, but I cannot see how to solve it.
+    dotblas_o = env.PythonObject('_dotblas', source = dotblas_src)
+    env.Depends(dotblas_o, pjoin("blasdot", "cblas.h"))
+    dotblas = env.DistutilsPythonExtension('_dotblas', dotblas_o)



More information about the Numpy-svn mailing list