Commit: 19381673a80ccf071de2615bca1ad331aafc9820 Author: Brecht Van Lommel Date: Thu Dec 15 13:18:27 2022 +0100 Branches: temp-linux-35x-libs https://developer.blender.org/rB19381673a80ccf071de2615bca1ad331aafc9820
More changes for new Linux libs * Remove unnecessary check for Blosc, this is part of OpenVDB lib now * Remove WITH_CXX11_ABI, always use new C++11 ABI now * Replace centos7 by glibc_228 everywhere =================================================================== M CMakeLists.txt M GNUmakefile M build_files/buildbot/config/blender_linux.cmake M build_files/cmake/platform/platform_unix.cmake M build_files/utils/make_update.py =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 4de2454cfd8..74bfb23a3a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -749,11 +749,6 @@ if("${CMAKE_GENERATOR}" MATCHES "Ninja") mark_as_advanced(WITH_NINJA_POOL_JOBS) endif() -if(UNIX AND NOT APPLE) - option(WITH_CXX11_ABI "Use native C++11 ABI of compiler" ON) - mark_as_advanced(WITH_CXX11_ABI) -endif() - # Installation process. set(POSTINSTALL_SCRIPT "" CACHE FILEPATH "Run given CMake script after installation process") mark_as_advanced(POSTINSTALL_SCRIPT) @@ -1721,12 +1716,6 @@ if( string(APPEND CMAKE_C_FLAGS " -std=gnu11") endif() -if(UNIX AND NOT APPLE) - if(NOT WITH_CXX11_ABI) - string(APPEND PLATFORM_CFLAGS " -D_GLIBCXX_USE_CXX11_ABI=0") - endif() -endif() - if(WITH_COMPILER_SHORT_FILE_MACRO) # Use '-fmacro-prefix-map' for Clang and GCC (MSVC doesn't support this). add_check_c_compiler_flag(C_PREFIX_MAP_FLAGS C_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar) diff --git a/GNUmakefile b/GNUmakefile index 439b435f5f4..ba9ee978817 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -211,7 +211,7 @@ endif # Set the LIBDIR, an empty string when not found. LIBDIR:=$(wildcard ../lib/${OS_NCASE}_${CPU}) ifeq (, $(LIBDIR)) - LIBDIR:=$(wildcard ../lib/${OS_NCASE}_centos7_${CPU}) + LIBDIR:=$(wildcard ../lib/${OS_NCASE}_${CPU}_glibc_228) endif ifeq (, $(LIBDIR)) LIBDIR:=$(wildcard ../lib/${OS_NCASE}) diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 078ad425124..ae7849002f7 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -7,7 +7,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake") message(STATUS "Building in Rocky 8 Linux 64bit environment") set(LIBDIR_NAME "linux_x86_64_glibc_228") -set(WITH_CXX11_ABI OFF CACHE BOOL "" FORCE) # ######## Linux-specific build options ######## # Options which are specific to Linux-only platforms diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index bcc90cef7c2..00869414391 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -10,16 +10,15 @@ if(NOT DEFINED LIBDIR) string(TOLOWER ${LIBDIR_NAME} LIBDIR_NAME) set(LIBDIR_NATIVE_ABI ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_NAME}) - # Path to precompiled libraries with known CentOS 7 ABI. - set(LIBDIR_CENTOS7_ABI ${CMAKE_SOURCE_DIR}/../lib/linux_centos7_x86_64) + # Path to precompiled libraries with known glibc 2.28 ABI. + set(LIBDIR_GLIBC228_ABI ${CMAKE_SOURCE_DIR}/../lib/linux_x86_64_glibc_228) # Choose the best suitable libraries. if(EXISTS ${LIBDIR_NATIVE_ABI}) set(LIBDIR ${LIBDIR_NATIVE_ABI}) set(WITH_LIBC_MALLOC_HOOK_WORKAROUND True) - elseif(EXISTS ${LIBDIR_CENTOS7_ABI}) - set(LIBDIR ${LIBDIR_CENTOS7_ABI}) - set(WITH_CXX11_ABI OFF) + elseif(EXISTS ${LIBDIR_GLIBC228_ABI}) + set(LIBDIR ${LIBDIR_GLIBC228_ABI}) if(WITH_MEM_JEMALLOC) # jemalloc provides malloc hooks. set(WITH_LIBC_MALLOC_HOOK_WORKAROUND False) @@ -30,7 +29,7 @@ if(NOT DEFINED LIBDIR) # Avoid namespace pollustion. unset(LIBDIR_NATIVE_ABI) - unset(LIBDIR_CENTOS7_ABI) + unset(LIBDIR_GLIBC228_ABI) endif() # Support restoring this value once pre-compiled libraries have been handled. @@ -330,10 +329,8 @@ if(WITH_OPENVDB) find_package(OpenVDB) set_and_warn_library_found("OpenVDB" OPENVDB_FOUND WITH_OPENVDB) - if(OPENVDB_FOUND) - add_bundled_libraries(openvdb/lib) - find_package_wrapper(Blosc) - set_and_warn_library_found("Blosc" BLOSC_FOUND WITH_OPENVDB_BLOSC) + if(WITH_OPENVDB) + add_bundled_libraries(openvdb/lib) endif() endif() diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index 93820ee994a..fbadeecd597 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -41,7 +41,7 @@ def parse_arguments() -> argparse.Namespace: parser.add_argument("--svn-command", default="svn") parser.add_argument("--svn-branch", default=None) parser.add_argument("--git-command", default="git") - parser.add_argument("--use-centos-libraries", action="store_true") + parser.add_argument("--use-linux-libraries", action="store_true") return parser.parse_args() @@ -71,8 +71,8 @@ def svn_update(args: argparse.Namespace, release_version: Optional[str]) -> None # this script is bundled as part of the precompiled libraries. However it # is used by the buildbot. lib_platform = "win64_vc15" - elif args.use_centos_libraries: - lib_platform = "linux_centos7_x86_64" + elif args.use_linux_libraries: + lib_platform = "linux_x86_64_glibc_228" else: # No precompiled libraries for Linux. lib_platform = None _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs