diff --git a/README/ReleaseNotes/v640/index.md b/README/ReleaseNotes/v640/index.md index daa35ae22ff65..ad470ed6a8152 100644 --- a/README/ReleaseNotes/v640/index.md +++ b/README/ReleaseNotes/v640/index.md @@ -79,8 +79,8 @@ The following people have contributed to this new version: ### Moving from builtin dependencies to system-provided packages * The general direction of the ROOT project is to become more and more reliant on system packages. It is *recommended* to make the packages required by ROOT available on the system, e.g. via a package manager, and not with the builtin mechanism. This allows for timely updates and reduces the size of the installed binaries. -* The previously vendored builtins `freetype`, `zlib`, `lzma`, `zstd`, `lz4`, `libpng`, `giflib`, `libjpeg`, and `openssl` should be installed in the system if possible. ROOT will not automatically fall-back to their builtin versions if these are not found: the user is informed of that with a helpful message. If installing these dependencies in the system is not possible, the CMake option `-Dbuiltin_XYZ=ON` has to be consciously chosen by the user. -* For the builtin versions of `freetype`, `zlib`, `lzma`, `zstd`, `lz4`, `libpng`, `giflib`, `libjpeg`, the source tarballs are now fetched from [SPI](https://spi.web.cern.ch)'s [website](https://lcgpackages.web.cern.ch/), as for the vast majority of ROOT's builtins, e.g. `openssl` or `xrootd`. +* The previously vendored builtins `freetype`, `xxhash`, `zlib`, `lzma`, `zstd`, `lz4`, `libpng`, `giflib`, `libjpeg`, `pcre2` and `openssl` should be installed in the system if possible. ROOT will not automatically fall-back to their builtin versions if these are not found: the user is informed of that with a helpful message. If installing these dependencies in the system is not possible, the CMake option `-Dbuiltin_XYZ=ON` has to be consciously chosen by the user. +* For the builtin versions of `freetype`, `xxhash`, `zlib`, `lzma`, `zstd`, `lz4`, `libpng`, `giflib`, `libjpeg`, `pcre2`, the source tarballs are now fetched from [SPI](https://spi.web.cern.ch)'s [website](https://lcgpackages.web.cern.ch/), as for the vast majority of ROOT's builtins, e.g. `openssl` or `xrootd`. ## Core Libraries diff --git a/cmake/modules/RootBuildOptions.cmake b/cmake/modules/RootBuildOptions.cmake index 51fbd42163432..64f691cdd8ade 100644 --- a/cmake/modules/RootBuildOptions.cmake +++ b/cmake/modules/RootBuildOptions.cmake @@ -88,29 +88,29 @@ MARK_AS_ADVANCED(builtin_cling) ROOT_BUILD_OPTION(builtin_civetweb ON "Use civetweb distributed with ROOT") ROOT_BUILD_OPTION(builtin_cppzmq OFF "Use ZeroMQ C++ bindings installed by ROOT (requires network)") ROOT_BUILD_OPTION(builtin_fftw3 OFF "Build FFTW3 internally (requires network)") -ROOT_BUILD_OPTION(builtin_freetype OFF "Build bundled copy of freetype") +ROOT_BUILD_OPTION(builtin_freetype OFF "Build freetype internally (requires network)") ROOT_BUILD_OPTION(builtin_ftgl OFF "Build bundled copy of FTGL") -ROOT_BUILD_OPTION(builtin_gif OFF "Build bundled copy of libgif") -ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build bundled copy of gl2ps") +ROOT_BUILD_OPTION(builtin_gif OFF "Build libgif internally (requires network)") +ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build gl2ps internally (requires network)") ROOT_BUILD_OPTION(builtin_gsl OFF "Build GSL internally (requires network)") ROOT_BUILD_OPTION(builtin_gtest OFF "Build googletest internally (requires network)") -ROOT_BUILD_OPTION(builtin_jpeg OFF "Build bundled copy of libjpeg") +ROOT_BUILD_OPTION(builtin_jpeg OFF "Build libjpeg internally (requires network)") ROOT_BUILD_OPTION(builtin_llvm ON "Build bundled copy of LLVM") -ROOT_BUILD_OPTION(builtin_lz4 OFF "Build bundled copy of lz4") -ROOT_BUILD_OPTION(builtin_lzma OFF "Build bundled copy of lzma") +ROOT_BUILD_OPTION(builtin_lz4 OFF "Build lz4 internally (requires network)") +ROOT_BUILD_OPTION(builtin_lzma OFF "Build lzma internally (requires network)") ROOT_BUILD_OPTION(builtin_nlohmannjson OFF "Use nlohmann/json.hpp file distributed with ROOT") ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally (requires network)") ROOT_BUILD_OPTION(builtin_openui5 ON "Use openui5 bundle distributed with ROOT") ROOT_BUILD_OPTION(builtin_pcre OFF "Build bundled copy of PCRE") -ROOT_BUILD_OPTION(builtin_png OFF "Build bundled copy of libpng") +ROOT_BUILD_OPTION(builtin_png OFF "Build libpng internally (requires network)") ROOT_BUILD_OPTION(builtin_tbb OFF "Build TBB internally (requires network)") ROOT_BUILD_OPTION(builtin_unuran OFF "Build bundled copy of unuran") ROOT_BUILD_OPTION(builtin_vdt OFF "Build VDT internally (requires network)") ROOT_BUILD_OPTION(builtin_xrootd OFF "Build XRootD internally (requires network)") ROOT_BUILD_OPTION(builtin_xxhash OFF "Build bundled copy of xxHash") ROOT_BUILD_OPTION(builtin_zeromq OFF "Build ZeroMQ internally (requires network)") -ROOT_BUILD_OPTION(builtin_zlib OFF "Build bundled copy of zlib") -ROOT_BUILD_OPTION(builtin_zstd OFF "Build included libzstd, or use system libzstd") +ROOT_BUILD_OPTION(builtin_zlib OFF "Build zlib internally (requires network)") +ROOT_BUILD_OPTION(builtin_zstd OFF "Build zstd internally (requires network)") ROOT_BUILD_OPTION(ccache OFF "Enable ccache usage for speeding up builds") ROOT_BUILD_OPTION(cefweb OFF "Enable support for CEF (Chromium Embedded Framework) web-based display") ROOT_BUILD_OPTION(check_connection ON "Fail the configuration step if there is no internet connection, but it's required for the build")