diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-01-22 20:40:40 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-01-22 20:40:40 +0400 |
| commit | 10261c4250e4595837ca973f6c906920f896ee0b (patch) | |
| tree | 7b0c1dc726bb1618eaf7bbbb61c1d602530e0504 /build_files | |
| parent | 78f5d531a4ccb1fd8bc4dae21b08423302b6039c (diff) | |
a better fix for scons finding pyconfig.h in ubuntu 12.10
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/Modules/FindPython.py | 8 | ||||
| -rw-r--r-- | build_files/scons/config/linux-config.py | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/build_files/scons/config/Modules/FindPython.py b/build_files/scons/config/Modules/FindPython.py index c93a10351d5..bdf314e9263 100644 --- a/build_files/scons/config/Modules/FindPython.py +++ b/build_files/scons/config/Modules/FindPython.py @@ -15,6 +15,11 @@ def FindPython(): abi_flags = cur_flags break + # Find config.h. In some distros, such as ubuntu 12.10 they are not in standard include dir. + incconf64 = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags, "pyconfig.h") + if os.path.exists(incconf64): + incconf = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags) + # Determine whether python is in /usr/lib or /usr/lib64 lib32 = os.path.join(python, "lib", "python" + version, "sysconfig.py") lib64 = os.path.join(python, "lib64", "python" + version, "sysconfig.py") @@ -29,4 +34,5 @@ def FindPython(): return {'PYTHON': python, "VERSION": version, 'LIBPATH': libpath, - 'ABI_FLAGS': abi_flags} + 'ABI_FLAGS': abi_flags, + 'CONFIG': incconf} diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index db3b369c5c4..0902d75304b 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -5,9 +5,10 @@ py = FindPython() BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS'] BF_PYTHON = py['PYTHON'] BF_PYTHON_LIBPATH = py['LIBPATH'] +BF_PYTHON_CONFIG = py['CONFIG'] BF_PYTHON_VERSION = py['VERSION'] WITH_BF_STATICPYTHON = False -BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' +BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS} ' + BF_PYTHON_CONFIG BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] |