diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-03-16 16:10:30 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-03-16 16:10:30 +0300 |
| commit | d07a7697cfb064f5129469018082f43a8a86d92f (patch) | |
| tree | b741f3c4b447bd518432e80f57fa2bdeb06b8b1c /build_files/build_environment/cmake/sqlite.cmake | |
| parent | 4d3cdb32d399335dba72c180309c0d34f93cd533 (diff) | |
Fix T86124: Self-hosting external libraries packages
Allow downloading of source packages of Blender's dependencies, so that
it's easier to provide a "full source archive" that contains the blender
source + all dependencies archives. A `make` command for this will be
introduced soon.
This changes the deps builder slightly to be more flexible with the
origin of our source packages.
To support this a new CMake variable has been added called `PACKAGE_DIR`
where all sources archives will be stored.
default: a directory called `packages` in the build folder.
alternative-default: if a directory called `packages` exists in the
blender source folder that will be used. This is to support the "full
source archive" use case.
The download phase have been moved from the build phase to the configure
phase. Configure will download all sources validate the hashes while
downloading.
All `[depname].cmake` files have been changed to take a local
`file://[path_to_local_tarball]` path rather than a remote URI.
A second requirement was that there needed to be an option to grab the
sources from the blender SVN mirror rather than upstream. For this an
option has been added PACKAGE_USE_UPSTREAM_SOURCES (default ON). The
exact location in SVN still needs to be worked out, I tested with my
local webserver and codewise it checks out. The path that is in there
currently will not work (given there is no mirror there yet).
To build this mirror our local package caches can be used.
Reviewed By: lazydodo
Differential Revision: https://developer.blender.org/D10598
Diffstat (limited to 'build_files/build_environment/cmake/sqlite.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/sqlite.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/sqlite.cmake b/build_files/build_environment/cmake/sqlite.cmake index a77d3830b45..16fee8264de 100644 --- a/build_files/build_environment/cmake/sqlite.cmake +++ b/build_files/build_environment/cmake/sqlite.cmake @@ -60,9 +60,9 @@ if(UNIX) endif() ExternalProject_Add(external_sqlite - URL ${SQLITE_URI} + URL file://${PACKAGE_DIR}/${SQLITE_FILE} DOWNLOAD_DIR ${DOWNLOAD_DIR} - URL_HASH SHA1=${SQLITE_HASH} + URL_HASH ${SQLITE_HASH_TYPE}=${SQLITE_HASH} PREFIX ${BUILD_DIR}/sqlite PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/sqlite/src/external_sqlite < ${PATCH_DIR}/sqlite.diff CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS} |