[Bf-codereview] [#30039] Fix SCons build on Fedora where Python is compiled with --wide-char ABI (issue 5610047)

techtonik at gmail.com techtonik at gmail.com
Wed Feb 1 08:04:12 CET 2012


Reviewers: bf-codereview_blender.org,

Description:
http://projects.blender.org/tracker/?func=detail&atid=127&aid=30039&group_id=9

Please review this at http://codereview.appspot.com/5610047/

Affected files:
   build_files/scons/config/linux-config.py


Index: build_files/scons/config/linux-config.py
===================================================================
--- build_files/scons/config/linux-config.py	(revision 43795)
+++ build_files/scons/config/linux-config.py	(working copy)
@@ -8,12 +8,14 @@
      LCGDIR = '../lib/linux'
  LIBDIR = "#${LCGDIR}"

-BF_PYTHON_ABI_FLAGS = 'm'  # Most common for linux distros
  BF_PYTHON = '/usr'
  BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
  BF_PYTHON_VERSION = '3.2'
  WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC  
= '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+for BF_PYTHON_ABI_FLAGS in ('m', 'mu'):  # most common for linux  
distributions
+    BF_PYTHON_INC  
= '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}'
+    if os.path.exists(BF_PYTHON_INC):
+        break
  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-codereview mailing list