diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-21 17:31:46 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-21 17:31:46 +0400 |
commit | 36f20f162caf83929e6eb07be6b73eb59740ead4 (patch) | |
tree | d917ea754c0cdd3d4b59f4df62dbb566cc52a78b /build_files | |
parent | 4427c146832a3398178ad4851e9c9606fad17489 (diff) |
Fix #28154: linux3-config.py doesn't exist
Change OURPLATFORM from "linux<major_version>" to simple "linux".
Since new policy for linux kernel versions that major version in
platform doesn't make much sense for building rules so the same
rules could be used for both of linux2 and linux3 now/
Tested on both of linux2 and linux3 systems.
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/scons/config/linux-config.py (renamed from build_files/scons/config/linux2-config.py) | 6 | ||||
-rw-r--r-- | build_files/scons/tools/Blender.py | 6 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux-config.py index d8e227cfb21..c6613ec0ac1 100644 --- a/build_files/scons/config/linux2-config.py +++ b/build_files/scons/config/linux-config.py @@ -1,4 +1,4 @@ -LCGDIR = '../lib/linux2' +LCGDIR = '../lib/linux' LIBDIR = "${LCGDIR}" BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros @@ -241,8 +241,8 @@ BF_PROFILE_LINKFLAGS = ['-pg'] BF_DEBUG = False BF_DEBUG_CCFLAGS = ['-g', '-D_DEBUG'] -BF_BUILDDIR = '../build/linux2' -BF_INSTALLDIR='../install/linux2' +BF_BUILDDIR = '../build/linux' +BF_INSTALLDIR='../install/linux' #Link against pthread PLATFORM_LINKFLAGS = ['-pthread'] diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 6fae2785192..0b1f3fcd8a8 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -206,7 +206,7 @@ def setup_staticlibs(lenv): if lenv['WITH_BF_STATICJEMALLOC']: statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC']) - if lenv['OURPLATFORM']=='linux2': + if lenv['OURPLATFORM']=='linux': if lenv['WITH_BF_3DMOUSE']: libincs += Split(lenv['BF_3DMOUSE_LIBPATH']) if lenv['WITH_BF_STATIC3DMOUSE']: @@ -277,7 +277,7 @@ def setup_syslibs(lenv): if not lenv['WITH_BF_STATICJEMALLOC']: syslibs += Split(lenv['BF_JEMALLOC_LIB']) - if lenv['OURPLATFORM']=='linux2': + if lenv['OURPLATFORM']=='linux': if lenv['WITH_BF_3DMOUSE']: if not lenv['WITH_BF_STATIC3DMOUSE']: syslibs += Split(lenv['BF_3DMOUSE_LIB']) @@ -775,7 +775,7 @@ class BlenderEnvironment(SConsEnvironment): if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'): if lenv['BF_DEBUG']: lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt']) - if lenv['OURPLATFORM']=='linux2': + if lenv['OURPLATFORM']=='linux': if lenv['WITH_BF_PYTHON']: lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS']) if lenv['OURPLATFORM']=='sunos5': diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 25e0582c536..d222c0bcc18 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -568,7 +568,7 @@ def buildslave(target=None, source=None, env=None): extension = '.tar.bz2' platform = env['OURPLATFORM'].split('-')[0] - if platform == 'linux2': + if platform == 'linux': import platform bitness = platform.architecture()[0] |