diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:42:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-29 17:42:32 +0300 |
| commit | fd2615fd9b5ac17a006cb3836ebd58e538517507 (patch) | |
| tree | a12938bf7f09ef36998b199a09efac3a344115c0 /build_files/buildbot | |
| parent | 0d085790d13b2c261210addb12fabc1fea82bdef (diff) | |
| parent | ddf8c49736864fe89348c002fecaacdcb1c28c8e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 30 | ||||
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 9 |
2 files changed, 34 insertions, 5 deletions
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 9625fabec30..0500bfa7f99 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -5,7 +5,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake") # Detect which libc we'll be linking against. # Some of the paths will depend on this -if(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so") +if(EXISTS "/lib/x86_64-linux-gnu/libc-2.24.so") + message(STATUS "Building in GLibc-2.24 environment") + set(GLIBC "2.24") + set(MULTILIB "/x86_64-linux-gnu") +elseif(EXISTS "/lib/i386-linux-gnu//libc-2.24.so") + message(STATUS "Building in GLibc-2.24 environment") + set(GLIBC "2.24") + set(MULTILIB "/i386-linux-gnu") +elseif(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so") message(STATUS "Building in GLibc-2.19 environment") set(GLIBC "2.19") set(MULTILIB "/x86_64-linux-gnu") @@ -40,7 +48,10 @@ set(WITH_PYTHON_INSTALL_NUMPY ON CACHE BOOL "" FORCE) set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE) # ######## Release environment specific settings ######## -# All the hardcoded libraru paths and such + +if (NOT ${GLIBC} STREQUAL "2.24") + +# All the hardcoded library paths and such # LLVM libraries set(LLVM_VERSION "3.4" CACHE STRING "" FORCE) @@ -147,5 +158,20 @@ set(BLOSC_LIBRARY CACHE BOOL "" FORCE ) +else() + +# Set path to precompiled libraries. +set(LIBDIR_NAME ${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}) +string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME) +set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}") + +# TODO(sergey): Remove once Python is oficially bumped to 3.7. +set(PYTHON_VERSION 3.7) + +# Ensure specific configuration of various libraries. +set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) + +endif() + # Additional linking libraries set(CMAKE_EXE_LINKER_FLAGS "-lrt -static-libstdc++" CACHE STRING "" FORCE) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index fc430971c19..ce4d0c8de66 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -101,7 +101,9 @@ if 'cmake' in builder: elif builder.startswith('linux'): tokens = builder.split("_") glibc = tokens[1] - if glibc == 'glibc219': + if glibc == 'glibc224': + deb_name = "stretch" + elif glibc == 'glibc219': deb_name = "jessie" elif glibc == 'glibc211': deb_name = "squeeze" @@ -113,8 +115,9 @@ if 'cmake' in builder: bits = 32 chroot_name = 'buildbot_' + deb_name + '_i686' targets = ['blender'] - cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", - "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) + if deb_name != "stretch": + cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", + "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) |