diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-12 22:31:15 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-12 22:31:15 +0400 |
| commit | e811a2d0ffe1e15190dd210d13ef3b50afc37d90 (patch) | |
| tree | e6f19277d788c83f1014faa943b0494094a3ea9f /SConstruct | |
| parent | f0caab41b22744c97352a7f710f7dde4c163194f (diff) | |
Fix to allow several include dirs for python under scons build system (needed with new py3.3 debian-like packages).
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index b7b27baae5a..4af85f51a4b 100644 --- a/SConstruct +++ b/SConstruct @@ -422,16 +422,22 @@ if not quickie and do_clean: # with _any_ library but since we used a fixed python version this tends to # be most problematic. if env['WITH_BF_PYTHON']: - py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h") - - if not os.path.exists(py_h): - print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n" + found_python_h = found_pyconfig_h = False + for bf_python_inc in env.subst('${BF_PYTHON_INC}').split(): + py_h = os.path.join(Dir(bf_python_inc).abspath, "Python.h") + if os.path.exists(py_h): + found_python_h = True + py_h = os.path.join(Dir(bf_python_inc).abspath, "pyconfig.h") + if os.path.exists(py_h): + found_pyconfig_h = True + + if not (found_python_h and found_pyconfig_h): + print("\nMissing: Python.h and/or pyconfig.h in\"" + env.subst('${BF_PYTHON_INC}') + "\",\n" " Set 'BF_PYTHON_INC' to point " - "to a valid python include path.\n Containing " - "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"") + "to valid python include path(s).\n Containing " + "Python.h and pyconfig.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"") Exit() - del py_h if not os.path.isdir ( B.root_build_dir): |