[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54003] trunk/blender/build_files/scons/ config: a better fix for scons finding pyconfig.h in ubuntu 12.10

Antony Riakiotakis kalast at gmail.com
Tue Jan 22 17:40:42 CET 2013


Revision: 54003
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54003
Author:   psy-fi
Date:     2013-01-22 16:40:40 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
a better fix for scons finding pyconfig.h in ubuntu 12.10

Modified Paths:
--------------
    trunk/blender/build_files/scons/config/Modules/FindPython.py
    trunk/blender/build_files/scons/config/linux-config.py

Modified: trunk/blender/build_files/scons/config/Modules/FindPython.py
===================================================================
--- trunk/blender/build_files/scons/config/Modules/FindPython.py	2013-01-22 16:06:09 UTC (rev 54002)
+++ trunk/blender/build_files/scons/config/Modules/FindPython.py	2013-01-22 16:40:40 UTC (rev 54003)
@@ -15,6 +15,11 @@
             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 @@
     return {'PYTHON': python,
             "VERSION": version,
             'LIBPATH': libpath,
-            'ABI_FLAGS': abi_flags}
+            'ABI_FLAGS': abi_flags,
+            'CONFIG': incconf}

Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py	2013-01-22 16:06:09 UTC (rev 54002)
+++ trunk/blender/build_files/scons/config/linux-config.py	2013-01-22 16:40:40 UTC (rev 54003)
@@ -5,9 +5,10 @@
 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']




More information about the Bf-blender-cvs mailing list