From 8b59cee84cb30a793a3db95cb0958f11a84c6af4 Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Fri, 7 Nov 2025 12:51:10 -0800 Subject: [PATCH] client/container: root: migrate to Botan3 - This is possible now that `dfi`'s ROOT build supports C++20 - No internal `dfi` API or impl changes are necessary * This includes any Botan signatures --- client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in | 2 +- container/src/root/macro/rootlogon.C | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in b/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in index d0bfd7e..21b36d1 100644 --- a/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in +++ b/client/Dockerfiles/local/finance/archlinux/Dockerfile.root.in @@ -32,7 +32,7 @@ RUN pacman -U root-6.36.04-6-x86_64.pkg.tar.zst --noconfirm --disable-download-t # docker-finance RUN pacman -Syu \ benchmark \ - botan2 \ + botan \ crypto++ \ gtest \ libsodium \ diff --git a/container/src/root/macro/rootlogon.C b/container/src/root/macro/rootlogon.C index 2cb0c48..d36967c 100644 --- a/container/src/root/macro/rootlogon.C +++ b/container/src/root/macro/rootlogon.C @@ -180,8 +180,7 @@ void help() void rootlogon() { // Add nested directory headers - // NOTE: Botan-3 is C++20 compliant (but ROOT isn't) - gInterpreter->AddIncludePath("/usr/include/botan-2"); + gInterpreter->AddIncludePath("/usr/include/botan-3"); // Link libraries gSystem->AddLinkedLibs("-lgtest"); // gtest/gmock