From e39b64737bf9b38469bd049cd7b368b0feb7e12a Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Wed, 1 Apr 2026 12:47:59 +0200 Subject: [PATCH 1/7] No builtin LZMA --- root.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/root.sh b/root.sh index 787a165249..85a5195991 100644 --- a/root.sh +++ b/root.sh @@ -188,6 +188,7 @@ cmake $SOURCEDIR -Dgviz=OFF \ -Dbuiltin_davix=OFF \ -Dbuiltin_fftw3=OFF \ + -Dbuiltin_lzma=OFF \ -Dtmva-sofie=ON \ -Dtmva-gpu=OFF \ -Ddavix=OFF \ From 4f2a296185d89bf89eab2a085f8545d35007ea5e Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Thu, 23 Apr 2026 12:52:40 +0200 Subject: [PATCH 2/7] Properly take LZMA from system on macos --- root.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root.sh b/root.sh index 85a5195991..1f9f911262 100644 --- a/root.sh +++ b/root.sh @@ -89,6 +89,7 @@ case $ARCHITECTURE in [[ ! $GSL_ROOT ]] && GSL_ROOT=$(brew --prefix gsl) [[ ! $OPENSSL_ROOT ]] && SYS_OPENSSL_ROOT=$(brew --prefix openssl@3) [[ ! $LIBPNG_ROOT ]] && LIBPNG_ROOT=$(brew --prefix libpng) + [[ ! $LZMA_ROOT ]] && LZMA_ROOT=$(brew --prefix xz) ;; esac @@ -170,6 +171,7 @@ cmake $SOURCEDIR ${LIBPNG_ROOT:+-DPNG_LIBRARY="${LIBPNG_ROOT}/lib/libpng.${SONAME}"} \ ${PROTOBUF_REVISION:+-DProtobuf_DIR=${PROTOBUF_ROOT}} \ ${ZLIB_ROOT:+-DZLIB_ROOT=${ZLIB_ROOT}} \ + ${LZMA_ROOT:+-DLibLZMA_ROOT=${LZMA_ROOT}} \ ${FFTW3_ROOT:+-DFFTW_DIR=${FFTW3_ROOT}} \ ${NLOHMANN_JSON_ROOT:+nlohmann_json_DIR=${NLOHMANN_JSON_ROOT}} \ -Dfftw3=ON \ From 96b486ed915630d6552f7213be1a2b11cf7225f1 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Thu, 23 Apr 2026 16:52:38 +0200 Subject: [PATCH 3/7] Proper LZMA variables --- root.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root.sh b/root.sh index 1f9f911262..8df7aa57aa 100644 --- a/root.sh +++ b/root.sh @@ -171,7 +171,8 @@ cmake $SOURCEDIR ${LIBPNG_ROOT:+-DPNG_LIBRARY="${LIBPNG_ROOT}/lib/libpng.${SONAME}"} \ ${PROTOBUF_REVISION:+-DProtobuf_DIR=${PROTOBUF_ROOT}} \ ${ZLIB_ROOT:+-DZLIB_ROOT=${ZLIB_ROOT}} \ - ${LZMA_ROOT:+-DLibLZMA_ROOT=${LZMA_ROOT}} \ + ${LZMA_ROOT:+-DLIBLZMA_INCLUDE_DIR=${LZMA_ROOT}/include} \ + ${LZMA_ROOT:+-DLIBLZMA_LIBRARY=${LZMA_ROOT}/lib/liblzma.${SONAME}} \ ${FFTW3_ROOT:+-DFFTW_DIR=${FFTW3_ROOT}} \ ${NLOHMANN_JSON_ROOT:+nlohmann_json_DIR=${NLOHMANN_JSON_ROOT}} \ -Dfftw3=ON \ From ac6cc511d4d21c292f1793d1ce51aa09ed016c83 Mon Sep 17 00:00:00 2001 From: Sergio Garcia Date: Thu, 23 Apr 2026 16:52:52 +0200 Subject: [PATCH 4/7] Disable vla extension warning --- root.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root.sh b/root.sh index 8df7aa57aa..c186d3f027 100644 --- a/root.sh +++ b/root.sh @@ -90,6 +90,7 @@ case $ARCHITECTURE in [[ ! $OPENSSL_ROOT ]] && SYS_OPENSSL_ROOT=$(brew --prefix openssl@3) [[ ! $LIBPNG_ROOT ]] && LIBPNG_ROOT=$(brew --prefix libpng) [[ ! $LZMA_ROOT ]] && LZMA_ROOT=$(brew --prefix xz) + EXTRA_CMAKE_CXX_FLAGS="-Wno-vla-cxx-extension" ;; esac @@ -142,6 +143,7 @@ CMAKE_GENERATOR=${CMAKE_GENERATOR:-Ninja} cmake $SOURCEDIR \ ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ + ${EXTRA_CMAKE_CXX_FLAGS:+-DCMAKE_CXX_FLAGS="${EXTRA_CMAKE_CXX_FLAGS}"} \ -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ -Dalien=OFF \ ${CMAKE_CXX_STANDARD:+-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}} \ From 6d36a4655b45e5a8c77fb16c41e7add2ca290e34 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Thu, 30 Apr 2026 10:50:56 +0200 Subject: [PATCH 5/7] Apply suggestions from code review Co-authored-by: Giulio Eulisse <10544+ktf@users.noreply.github.com> --- root.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root.sh b/root.sh index c186d3f027..49bb316351 100644 --- a/root.sh +++ b/root.sh @@ -90,7 +90,7 @@ case $ARCHITECTURE in [[ ! $OPENSSL_ROOT ]] && SYS_OPENSSL_ROOT=$(brew --prefix openssl@3) [[ ! $LIBPNG_ROOT ]] && LIBPNG_ROOT=$(brew --prefix libpng) [[ ! $LZMA_ROOT ]] && LZMA_ROOT=$(brew --prefix xz) - EXTRA_CMAKE_CXX_FLAGS="-Wno-vla-cxx-extension" + EXTRA_CMAKE_CXX_FLAGS="-Wno-vla-extension" ;; esac From 42064cc4c18f5707f80f42b6914d6dc9f35f7f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Tue, 5 May 2026 16:16:11 +0200 Subject: [PATCH 6/7] Dummy commit to restart CI --- root.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/root.sh b/root.sh index 49bb316351..cdd4d81605 100644 --- a/root.sh +++ b/root.sh @@ -214,6 +214,7 @@ cmake --build . --target install ${JOBS+-j $JOBS} # features we requested. "-Dfail-on-missing=ON" would probably be better. [ "$("$INSTALLROOT/bin/root-config" --has-fftw3)" = yes ] + # Add support for ROOT_PLUGIN_PATH envvar for specifying additional plugin search paths grep -v '^Unix.*.Root.PluginPath' $INSTALLROOT/etc/system.rootrc > system.rootrc.0 cat >> system.rootrc.0 <<\EOF From fa3b8911199610300a25653304c91d3472bfa359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <26327373+vkucera@users.noreply.github.com> Date: Tue, 5 May 2026 16:16:52 +0200 Subject: [PATCH 7/7] Dummy commit to restart CI --- root.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/root.sh b/root.sh index cdd4d81605..49bb316351 100644 --- a/root.sh +++ b/root.sh @@ -214,7 +214,6 @@ cmake --build . --target install ${JOBS+-j $JOBS} # features we requested. "-Dfail-on-missing=ON" would probably be better. [ "$("$INSTALLROOT/bin/root-config" --has-fftw3)" = yes ] - # Add support for ROOT_PLUGIN_PATH envvar for specifying additional plugin search paths grep -v '^Unix.*.Root.PluginPath' $INSTALLROOT/etc/system.rootrc > system.rootrc.0 cat >> system.rootrc.0 <<\EOF