Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

BUG: fix some SConscript issues

  - include lapack in spatial/qhull
  - import CheckF77Mangling
  • Loading branch information...
commit 5cc76b81a0f90dd142b27a81e1974759d5748235 1 parent 549a938
@pv pv authored
View
3  scipy/fftpack/SConscript
@@ -3,11 +3,12 @@
from os.path import join as pjoin
from numscons import GetNumpyEnvironment
+from numscons import CheckF77Mangling
env = GetNumpyEnvironment(ARGUMENTS)
env.Tool('f2py')
-config = env.NumpyConfigure()
+config = env.NumpyConfigure(custom_tests = {'CheckF77Mangling' : CheckF77Mangling})
config.CheckF77Mangling()
config.Finish()
View
4 scipy/interpolate/SConscript
@@ -2,12 +2,12 @@
# vim:syntax=python
from os.path import join as pjoin
-from numscons import GetNumpyEnvironment, CheckF77Clib
+from numscons import GetNumpyEnvironment, CheckF77Clib, CheckF77Mangling
env = GetNumpyEnvironment(ARGUMENTS)
env.Tool('f2py')
-config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib})
+config = env.NumpyConfigure(custom_tests = {'CheckF77Clib' : CheckF77Clib, 'CheckF77Mangling': CheckF77Mangling})
if not config.CheckF77Clib():
raise Exception("Could not check F77 runtime, needed for interpolate")
config.CheckF77Mangling()
View
28 scipy/spatial/SConscript
@@ -1,10 +1,33 @@
# Last Change: Mon Nov 03 06:00 PM 2008 J
# vim:syntax=python
from os.path import join
-from numscons import GetNumpyEnvironment
+from numscons import GetNumpyEnvironment, CheckF77LAPACK, CheckF77Clib
+from numscons import write_info
env = GetNumpyEnvironment(ARGUMENTS)
+#=======================
+# Starting Configuration
+#=======================
+config = env.NumpyConfigure(custom_tests = {'CheckLAPACK' : CheckF77LAPACK})
+
+#-----------------
+# Checking Lapack
+#-----------------
+st = config.CheckLAPACK()
+if not st:
+ has_lapack = 0
+else:
+ has_lapack = 1
+
+config.Finish()
+write_info(env)
+
+
+#==========
+# Build
+#==========
+
env.NumpyPythonExtension('ckdtree', source = ['ckdtree.c'])
env.NumpyPythonExtension('_distance_wrap',
@@ -16,6 +39,5 @@ src = [join('qhull', 'src', s) for s in [
'geom.c', 'geom2.c', 'global.c', 'io.c', 'mem.c',
'merge.c', 'poly.c', 'poly2.c', 'qset.c', 'user.c',
'stat.c', 'qhull.c']]
-qhullsrc = env.DistutilsStaticExtLibrary('qhullsrc', source=src)
-env.NumpyPythonExtension('qhull', source = 'qhull.c', LIBS=qhullsrc)
+env.NumpyPythonExtension('qhull', source = ['qhull.c'] + src)
Please sign in to comment.
Something went wrong with that request. Please try again.