[Bf-blender-cvs] [3ae74bcd29c] blender-v2.92-release: cmake/deps: remove 'tcl' language support from sqlite
Campbell Barton
noreply at git.blender.org
Tue Feb 2 09:17:10 CET 2021
Commit: 3ae74bcd29c6050c7261447c92737d85d4288bb7
Author: Campbell Barton
Date: Tue Feb 2 19:11:14 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rB3ae74bcd29c6050c7261447c92737d85d4288bb7
cmake/deps: remove 'tcl' language support from sqlite
Build sqlite without `tcl` support, as it's causes an error on
installation when `tcl` is installed into the systems `/usr/lib/` and
install isn't running as root.
This could be resolves by adding `tcl` as a dependency
however it's not needed for Python's sqlite integration.
Linux distributions (Debian & Arch at least) split this off
into a separate package (which Python doesn't depend on),
so there is no need for Blender to include sqlite's `tcl`
integration either.
Reviewed By: brecht, LazyDodo
Ref D10281
===================================================================
M build_files/build_environment/cmake/sqlite.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/sqlite.cmake b/build_files/build_environment/cmake/sqlite.cmake
index 90330c68811..002be924a50 100644
--- a/build_files/build_environment/cmake/sqlite.cmake
+++ b/build_files/build_environment/cmake/sqlite.cmake
@@ -42,7 +42,7 @@ if(UNIX)
-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-fPIC")
set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
- set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
+ set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5 --disable-tcl
--enable-shared=no)
endif()
More information about the Bf-blender-cvs
mailing list