diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-06-14 14:27:59 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-06-16 20:17:43 -0600 |
| commit | 16704fd870047d9b43334b7cef5ea98bcf5faeb3 (patch) | |
| tree | 0842d7d258b90659e926c0a58aec6697b9620316 | |
| parent | d1155a365d755c5b28c383bd2cd45203a8fa060f (diff) | |
| download | numpy-16704fd870047d9b43334b7cef5ea98bcf5faeb3.tar.gz | |
ENH: Make scons build the npysort library.
| -rw-r--r-- | numpy/core/SConscript | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/numpy/core/SConscript b/numpy/core/SConscript index 844b16776..5532ced7e 100644 --- a/numpy/core/SConscript +++ b/numpy/core/SConscript @@ -384,7 +384,7 @@ nditer_src = env.GenerateFromTemplate( lowlevel_strided_loops_src = env.GenerateFromTemplate( pjoin('src', 'multiarray', 'lowlevel_strided_loops.c.src')) einsum_src = env.GenerateFromTemplate(pjoin('src', 'multiarray', 'einsum.c.src')) -sort_src = env.GenerateFromTemplate(pjoin('src', 'npysort','sort.c.src')) +sortmodule_src = env.GenerateFromTemplate(pjoin('src', 'npysort','sortmodule.c.src')) umathmodule_src = env.GenerateFromTemplate(pjoin('src', 'umath', 'umathmodule.c.src')) umath_tests_src = env.GenerateFromTemplate(pjoin('src', 'umath', @@ -431,6 +431,23 @@ mlib_ini = env.SubstInFile(pjoin('lib', 'npy-pkg-config', 'mlib.ini'), env.Install('$distutils_installdir/lib/npy-pkg-config', mlib_ini) env.Install('$distutils_installdir/lib/npy-pkg-config', npymath_ini) +# npysort core lib +npysort_src = [env.GenerateFromTemplate(pjoin('src', 'npysort', 'sort.c.src'))] +env.DistutilsInstalledStaticExtLibrary("npysort", npysort_src, install_dir='lib') +env.Prepend(LIBS=["npysort"]) +env.Prepend(LIBPATH=["."]) + +subst_dict = {'@prefix@': '$distutils_install_prefix', + '@pkgname@': 'numpy.core', '@sep@': os.path.sep} +npysort_ini = env.SubstInFile(pjoin('lib', 'npy-pkg-config', 'npysort.ini'), + 'npysort.ini.in', SUBST_DICT=subst_dict) + +#subst_dict = {'@posix_mathlib@': " ".join(['-l%s' % l for l in mlib]), +# '@msvc_mathlib@': " ".join(['%s.mlib' % l for l in mlib])} +#mlib_ini = env.SubstInFile(pjoin('lib', 'npy-pkg-config', 'mlib.ini'), +# 'mlib.ini.in', SUBST_DICT=subst_dict) +env.Install('$distutils_installdir/lib/npy-pkg-config', npysort_ini) + #----------------- # Build multiarray #----------------- @@ -480,7 +497,6 @@ env.DistutilsPythonExtension('multiarray_tests', source=multiarray_tests_src) #------------------ # Build sort module #------------------ -sortmodule_src = [pjoin('src', 'npysort','sortmodule.c')] sort = env.DistutilsPythonExtension('_sort', source = sortmodule_src) #------------------- |