[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35482] trunk/blender/build_files/scons/ config: edit scons to use py3.2 on all os's and use 'm' abiflag on linux since this is the most common.
Campbell Barton
ideasman42 at gmail.com
Sat Mar 12 02:03:16 CET 2011
Revision: 35482
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35482
Author: campbellbarton
Date: 2011-03-12 01:03:15 +0000 (Sat, 12 Mar 2011)
Log Message:
-----------
edit scons to use py3.2 on all os's and use 'm' abiflag on linux since this is the most common.
Modified Paths:
--------------
trunk/blender/build_files/scons/config/aix4-config.py
trunk/blender/build_files/scons/config/freebsd7-config.py
trunk/blender/build_files/scons/config/freebsd8-config.py
trunk/blender/build_files/scons/config/freebsd9-config.py
trunk/blender/build_files/scons/config/irix6-config.py
trunk/blender/build_files/scons/config/linux2-config.py
trunk/blender/build_files/scons/config/linuxcross-config.py
trunk/blender/build_files/scons/config/openbsd3-config.py
trunk/blender/build_files/scons/config/sunos5-config.py
Modified: trunk/blender/build_files/scons/config/aix4-config.py
===================================================================
--- trunk/blender/build_files/scons/config/aix4-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/aix4-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -8,7 +8,7 @@
BF_VERSE_INCLUDE = "#extern/verse/dist"
BF_PYTHON = LCGDIR+'/python'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
WITH_BF_STATICPYTHON = 'true'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -6,7 +6,7 @@
BF_PYTHON = '/usr/local'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -6,7 +6,7 @@
BF_PYTHON = '/usr/local'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd9-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/freebsd9-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -6,7 +6,7 @@
BF_PYTHON = '/usr/local'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/irix6-config.py
===================================================================
--- trunk/blender/build_files/scons/config/irix6-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/irix6-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -4,7 +4,7 @@
LIBDIR = LCGDIR
BF_PYTHON = LCGDIR+'/python'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
WITH_BF_STATICPYTHON = 'true'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/linux2-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux2-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/linux2-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -1,15 +1,16 @@
LCGDIR = '../lib/linux2'
LIBDIR = "${LCGDIR}"
+BF_PYTHON_ABI_FLAGS = "m" # not a scons option
BF_PYTHON = '/usr'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
WITH_BF_STATICPYTHON = False
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
+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']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS + '.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = False
Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -2,7 +2,7 @@
LIBDIR = '${LCGDIR}'
BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}mw'
Modified: trunk/blender/build_files/scons/config/openbsd3-config.py
===================================================================
--- trunk/blender/build_files/scons/config/openbsd3-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/openbsd3-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -2,7 +2,7 @@
LIBDIR = '${LCGDIR}'
BF_PYTHON = '/usr/local'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
Modified: trunk/blender/build_files/scons/config/sunos5-config.py
===================================================================
--- trunk/blender/build_files/scons/config/sunos5-config.py 2011-03-12 00:50:34 UTC (rev 35481)
+++ trunk/blender/build_files/scons/config/sunos5-config.py 2011-03-12 01:03:15 UTC (rev 35482)
@@ -2,7 +2,7 @@
LIBDIR = '${LCGDIR}'
BF_PYTHON = '/usr/local'
-BF_PYTHON_VERSION = '3.1'
+BF_PYTHON_VERSION = '3.2'
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
More information about the Bf-blender-cvs
mailing list