From 918c77b2aa1b5cb4020cc0ab887ee215d5ccd884 Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Thu, 14 May 2026 14:14:53 -0700 Subject: [PATCH 1/8] Update to Ubuntu 26.04 and ROOT 6.38.04 --- Dockerfile | 17 ++++++++++------- README.md | 2 +- install-ubuntu-packages.sh | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99ab421..b186a03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 LABEL maintainer="Tom Eichlersmith , Tamas Almos Vami " -LABEL ubuntu.version="24.04" +LABEL ubuntu.version="26.04" ARG NPROC=1 @@ -19,6 +19,7 @@ RUN chmod +x /usr/local/bin/install-ubuntu-packages # Basic OS/System tools RUN install-ubuntu-packages \ binutils \ + ccache \ cmake \ gcc g++ gfortran \ locales \ @@ -117,7 +118,6 @@ RUN mkdir src && \ RUN install-ubuntu-packages \ fonts-freefont-ttf \ - libafterimage-dev \ libfftw3-dev \ libfreetype6-dev \ libftgl-dev \ @@ -139,10 +139,10 @@ RUN install-ubuntu-packages \ libz-dev \ libzstd-dev \ nlohmann-json3-dev \ - srm-ifce-dev \ - libgsl-dev + libgsl-dev \ + libcrypt-dev -ENV ROOT_VERSION="6.34.10" +ENV ROOT_VERSION="6.38.04" LABEL root.version=${ROOT_VERSION} RUN mkdir src &&\ ${__wget} https://root.cern/download/root_v${ROOT_VERSION}.source.tar.gz |\ @@ -197,7 +197,9 @@ RUN __owner="geant4" &&\ -DGEANT4_USE_GDML=ON \ -DGEANT4_INSTALL_EXAMPLES=OFF \ -DGEANT4_USE_OPENGL_X11=ON \ + -DGEANT4_USE_SYSTEM_ZLIB=ON \ -DCMAKE_INSTALL_PREFIX=${__prefix} \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -B src/build \ -S src \ &&\ @@ -257,7 +259,8 @@ RUN mkdir src &&\ -DHEPMC3_BUILD_STATIC_LIBS:BOOL=ON \ -DHEPMC3_BUILD_DOCS:BOOL=OFF \ -DHEPMC3_ENABLE_PYTHON:BOOL=ON \ - -DHEPMC3_PYTHON_VERSIONS=3.10 \ + -DHEPMC3_PYTHON_VERSIONS=3.14 \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -B src/build \ -S src \ &&\ diff --git a/README.md b/README.md index ab0e7cc..85ed552 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Software Package | Version | Construction Process [LHAPDF](https://www.lhapdf.org/) | 6.5.5 | Built from source [Pythia8](https://pythia.org/) | 8.313 | Built from source [nlohmann/json](https://json.nlohmann.me/) | 3.11.3 | From Ubuntu Repos -[ROOT](https://root.cern.ch/) | 6.34.10 | Built from source +[ROOT](https://root.cern.ch/) | 6.38.04 | Built from source [Geant4](https://geant4.web.cern.ch/) | [LDMX.10.2.3\_v0.6](https://github.com/LDMX-Software/geant4/tree/LDMX.10.2.3_v0.6) | Built from source [Eigen](https://eigen.tuxfamily.org) | 3.4.0 | Built from source [HEPMC3](https://hepmc.web.cern.ch) | 3.3.0 | Built from source diff --git a/install-ubuntu-packages.sh b/install-ubuntu-packages.sh index da36cad..9835a8b 100644 --- a/install-ubuntu-packages.sh +++ b/install-ubuntu-packages.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e # # Installs any dependencies from the ubuntu repos that are passed in as # arguments. From 9996e01f2b55dc6dfd005ee669c8fede225610bc Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Thu, 14 May 2026 14:50:50 -0700 Subject: [PATCH 2/8] Add also libcurl4 directly --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index b186a03..5d47990 100644 --- a/Dockerfile +++ b/Dockerfile @@ -400,6 +400,7 @@ RUN install-ubuntu-packages \ ca-certificates \ clang-format \ libboost-all-dev \ + libcurl4-openssl-dev \ libssl-dev ############################################################################### From 2e6961049011ad83b7f5d63152f029eea84ae64e Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Thu, 14 May 2026 16:02:15 -0700 Subject: [PATCH 3/8] Make local world-writable --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5d47990..99cef76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -454,5 +454,8 @@ RUN update-ca-certificates # copy environment initialization script into container # and make sure the default profile will call it as well ENV CMAKE_PREFIX_PATH=/usr/local +# denv runs as the host user (non-root), so /usr/local must be world-writable +# for ldmx-sw to install its libraries there +RUN chmod -R a+rwX /usr/local COPY ./ldmx-env-init.sh /etc/ RUN printf "\n%s\n" ". /etc/ldmx-env-init.sh" >> /etc/skel/.profile From d01b3faf65e5636c8a1df9aec703df2b038bbf38 Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Mon, 18 May 2026 12:29:42 -0700 Subject: [PATCH 4/8] Remove caching and the permissions --- .github/workflows/ci.yml | 2 -- Dockerfile | 11 ++++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f84556..92e1c22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,8 +64,6 @@ jobs: uses: docker/build-push-action@v6 with: context: . - cache-from: type=registry,ref=ldmx/dev:build-cache-${{ matrix.platform }} - cache-to: type=registry,ref=ldmx/dev:build-cache-${{ matrix.platform }},mode=max platforms: linux/${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true diff --git a/Dockerfile b/Dockerfile index 99cef76..28eba1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -152,6 +152,8 @@ RUN mkdir src &&\ -DCMAKE_CXX_STANDARD=20 \ -DCMAKE_INSTALL_PREFIX=${__prefix} \ -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_CXX_FLAGS="-fno-strict-aliasing" \ + -DCMAKE_C_FLAGS="-fno-strict-aliasing" \ -Dgnuinstall=ON \ -Dgminimal=ON \ -Dasimage=ON \ @@ -160,8 +162,8 @@ RUN mkdir src &&\ -Dopengl=ON \ -Dpyroot=ON \ -Dxrootd=OFF \ - -Dmathmore=ON \ - -Dpythia8=ON \ + -Dmathmore=ON \ + -Dpythia8=ON \ -B build \ -S src \ && cmake --build build --target install -j$NPROC &&\ @@ -200,6 +202,8 @@ RUN __owner="geant4" &&\ -DGEANT4_USE_SYSTEM_ZLIB=ON \ -DCMAKE_INSTALL_PREFIX=${__prefix} \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_CXX_FLAGS="-fno-strict-aliasing" \ + -DCMAKE_C_FLAGS="-fno-strict-aliasing" \ -B src/build \ -S src \ &&\ @@ -454,8 +458,5 @@ RUN update-ca-certificates # copy environment initialization script into container # and make sure the default profile will call it as well ENV CMAKE_PREFIX_PATH=/usr/local -# denv runs as the host user (non-root), so /usr/local must be world-writable -# for ldmx-sw to install its libraries there -RUN chmod -R a+rwX /usr/local COPY ./ldmx-env-init.sh /etc/ RUN printf "\n%s\n" ". /etc/ldmx-env-init.sh" >> /etc/skel/.profile From 7e2efee4a13e6cae11f914510da3fbb3b6947c69 Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Mon, 18 May 2026 18:36:58 -0700 Subject: [PATCH 5/8] Add gcc-13 for GEANT compilation --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 28eba1b..4319c21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ RUN install-ubuntu-packages \ ccache \ cmake \ gcc g++ gfortran \ + gcc-13 g++-13 \ locales \ make \ parallel \ @@ -202,6 +203,8 @@ RUN __owner="geant4" &&\ -DGEANT4_USE_SYSTEM_ZLIB=ON \ -DCMAKE_INSTALL_PREFIX=${__prefix} \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DCMAKE_C_COMPILER=gcc-13 \ + -DCMAKE_CXX_COMPILER=g++-13 \ -DCMAKE_CXX_FLAGS="-fno-strict-aliasing" \ -DCMAKE_C_FLAGS="-fno-strict-aliasing" \ -B src/build \ From f78de4462cd917b1b26b8dda4ff7b4e8bc5b60da Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Mon, 18 May 2026 18:52:12 -0700 Subject: [PATCH 6/8] Update README with all the new versions in Ubuntu 26 --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 85ed552..69f8576 100644 --- a/README.md +++ b/README.md @@ -37,11 +37,11 @@ which provides support for Docker, Podman, and Apptainer. Software Package | Version | Construction Process ---|---|--- -[Ubuntu Server](https://ubuntu.com/) | 24.04 | Base Image -[GCC](https://gcc.gnu.org/) | 13.3.0 | From Ubuntu Repos -[Python](https://www.python.org/) | 3.12.3 | From Ubuntu Repos -[cmake](https://cmake.org/) | 3.28.3 | From Ubuntu Repos -[Boost](https://www.boost.org/doc/libs/1_83_0/) | 1.83.0 | From Ubuntu Repos +[Ubuntu Server](https://ubuntu.com/) | 26.04 | Base Image +[GCC](https://gcc.gnu.org/) | 15.2.0 | From Ubuntu Repos +[Python](https://www.python.org/) | 3.14.4 | From Ubuntu Repos +[cmake](https://cmake.org/) | 4.3.2 | From Ubuntu Repos +[Boost](https://www.boost.org/doc/libs/1_90_0/) | 1.9.0 | From Ubuntu Repos [XercesC](http://xerces.apache.org/xerces-c/) | 3.3.0 | Built from source [LHAPDF](https://www.lhapdf.org/) | 6.5.5 | Built from source [Pythia8](https://pythia.org/) | 8.313 | Built from source @@ -55,7 +55,7 @@ Software Package | Version | Construction Process [Catch2](https://github.com/catchorg/Catch2) | 3.8.0 | Built from source [Acts](https://acts.readthedocs.io/en/v36.0.0/) | 36.0.0 | Built from source [ONNX Runtime](https://github.com/microsoft/onnxruntime) | 1.15.0 | Download pre-built binaries -[Clang](https://clang.llvm.org/) | 18.1.3 | From Ubuntu Repos +[Clang](https://clang.llvm.org/) | 21.1.8 | From Ubuntu Repos More detailed documentation of the available software is online. - [Ubuntu Packages](https://ldmx-software.github.io/dev-build-context/ubuntu-packages.html) From 9b3ecaa70d05c9ad5589b6d6f46bcca86f1ffd4f Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Tue, 19 May 2026 09:04:28 -0700 Subject: [PATCH 7/8] Revert unneeded flags and move ROOT cxx to 23 --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e657dd..371feb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -151,11 +151,9 @@ RUN mkdir src &&\ ${__untar} &&\ cmake \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_STANDARD=20 \ + -DCMAKE_CXX_STANDARD=23 \ -DCMAKE_INSTALL_PREFIX=${__prefix} \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_CXX_FLAGS="-fno-strict-aliasing" \ - -DCMAKE_C_FLAGS="-fno-strict-aliasing" \ -Dgnuinstall=ON \ -Dgminimal=ON \ -Dasimage=ON \ @@ -206,8 +204,6 @@ RUN __owner="geant4" &&\ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_C_COMPILER=gcc-13 \ -DCMAKE_CXX_COMPILER=g++-13 \ - -DCMAKE_CXX_FLAGS="-fno-strict-aliasing" \ - -DCMAKE_C_FLAGS="-fno-strict-aliasing" \ -B src/build \ -S src \ &&\ From 386cbaf6201f8073f0d9c063a240d2019452e763 Mon Sep 17 00:00:00 2001 From: Tamas Almos Vami Date: Fri, 22 May 2026 12:58:34 -0700 Subject: [PATCH 8/8] Add patches --- ci/interop/v3.3.0.patch | 49 +++++++++++++++++++++++++-- ci/interop/v3.4.0.patch | 49 +++++++++++++++++++++++++-- ci/interop/v4.0.5.patch | 56 +++++++++++++++++++++++++++++++ ci/interop/v4.1.4.patch | 56 +++++++++++++++++++++++++++++++ ci/interop/v4.2.20.patch | 56 +++++++++++++++++++++++++++++++ ci/interop/v4.3.3.patch | 1 + ci/interop/v4.4.14.patch | 1 + ci/interop/v4.4.7.patch | 1 + ci/interop/v4.5.11.patch | 72 ++++++++++++++++++++++++++++++++++++++++ ci/interop/v4.6.5.patch | 72 ++++++++++++++++++++++++++++++++++++++++ ci/interop/v4.7.3.patch | 1 + 11 files changed, 410 insertions(+), 4 deletions(-) create mode 100644 ci/interop/v4.2.20.patch create mode 120000 ci/interop/v4.3.3.patch create mode 120000 ci/interop/v4.4.14.patch create mode 120000 ci/interop/v4.4.7.patch create mode 100644 ci/interop/v4.5.11.patch create mode 100644 ci/interop/v4.6.5.patch create mode 120000 ci/interop/v4.7.3.patch diff --git a/ci/interop/v3.3.0.patch b/ci/interop/v3.3.0.patch index 8737514..a9d1ce8 100644 --- a/ci/interop/v3.3.0.patch +++ b/ci/interop/v3.3.0.patch @@ -5,9 +5,54 @@ index e418c42..79ed3a3 100644 +++ b/Conditions/include/Conditions/SimpleTableCondition.h @@ -7,6 +7,7 @@ #define FRAMEWORK_SIMPLETABLECONDITION_H_ - + #include +#include - + #include "Framework/ConditionsObject.h" #include "Framework/Exception/Exception.h" +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -17,32 +17,27 @@ + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) +- endif() +- + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked + if (NOT Boost_FOUND) diff --git a/ci/interop/v3.4.0.patch b/ci/interop/v3.4.0.patch index de68c03..bf589b6 100644 --- a/ci/interop/v3.4.0.patch +++ b/ci/interop/v3.4.0.patch @@ -4,10 +4,55 @@ index 467d8b9..632de04 100644 --- a/Conditions/include/Conditions/SimpleTableCondition.h +++ b/Conditions/include/Conditions/SimpleTableCondition.h @@ -8,6 +8,7 @@ - + #include #include +#include - + #include "Framework/ConditionsObject.h" #include "Framework/Exception/Exception.h" +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -17,32 +17,27 @@ + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) +- endif() +- + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked + if (NOT Boost_FOUND) diff --git a/ci/interop/v4.0.5.patch b/ci/interop/v4.0.5.patch index 62ff99c..d1e6754 100644 --- a/ci/interop/v4.0.5.patch +++ b/ci/interop/v4.0.5.patch @@ -10,3 +10,59 @@ index d34d930d..b69f81c7 100644 #include "Framework/ConditionsObject.h" #include "Framework/Exception/Exception.h" +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -17,32 +17,27 @@ + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) +- endif() +- + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked + if (NOT Boost_FOUND) +diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx +--- a/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ b/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "Hcal/MyClusterWeight.h" + #include "Hcal/TemplatedClusterFinder.h" diff --git a/ci/interop/v4.1.4.patch b/ci/interop/v4.1.4.patch index 0f37d2e..ca8341a 100644 --- a/ci/interop/v4.1.4.patch +++ b/ci/interop/v4.1.4.patch @@ -21,3 +21,59 @@ index 140011d9..0e07b681 100644 #include #include "TrigScint/Firmware/clusterproducer.h" +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -17,32 +17,27 @@ + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) +- endif() +- + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked + if (NOT Boost_FOUND) +diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx +--- a/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ b/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "Hcal/MyClusterWeight.h" + #include "Hcal/TemplatedClusterFinder.h" diff --git a/ci/interop/v4.2.20.patch b/ci/interop/v4.2.20.patch new file mode 100644 index 0000000..f2ea221 --- /dev/null +++ b/ci/interop/v4.2.20.patch @@ -0,0 +1,56 @@ +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -17,32 +17,27 @@ + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) +- endif() +- + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked + if (NOT Boost_FOUND) +diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx +--- a/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ b/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "Hcal/MyClusterWeight.h" + #include "Hcal/TemplatedClusterFinder.h" diff --git a/ci/interop/v4.3.3.patch b/ci/interop/v4.3.3.patch new file mode 120000 index 0000000..49de7d8 --- /dev/null +++ b/ci/interop/v4.3.3.patch @@ -0,0 +1 @@ +v4.2.20.patch \ No newline at end of file diff --git a/ci/interop/v4.4.14.patch b/ci/interop/v4.4.14.patch new file mode 120000 index 0000000..49de7d8 --- /dev/null +++ b/ci/interop/v4.4.14.patch @@ -0,0 +1 @@ +v4.2.20.patch \ No newline at end of file diff --git a/ci/interop/v4.4.7.patch b/ci/interop/v4.4.7.patch new file mode 120000 index 0000000..49de7d8 --- /dev/null +++ b/ci/interop/v4.4.7.patch @@ -0,0 +1 @@ +v4.2.20.patch \ No newline at end of file diff --git a/ci/interop/v4.5.11.patch b/ci/interop/v4.5.11.patch new file mode 100644 index 0000000..d230064 --- /dev/null +++ b/ci/interop/v4.5.11.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,10 +55,10 @@ + + find_package(GENIE) + ++cmake_policy(SET CMP0167 NEW) + find_package( + Boost REQUIRED +- COMPONENTS system +- log ++ COMPONENTS log + filesystem + thread + chrono +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -12,32 +12,27 @@ + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) +- endif() +- + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked + if (NOT Boost_FOUND) +diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx +--- a/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ b/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "Hcal/MyClusterWeight.h" + #include "Hcal/TemplatedClusterFinder.h" diff --git a/ci/interop/v4.6.5.patch b/ci/interop/v4.6.5.patch new file mode 100644 index 0000000..37f3449 --- /dev/null +++ b/ci/interop/v4.6.5.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -61,10 +61,10 @@ + + find_package(GENIE) + ++cmake_policy(SET CMP0167 NEW) + find_package( + Boost REQUIRED +- COMPONENTS system +- log ++ COMPONENTS log + filesystem + thread + chrono +diff --git a/DetDescr/CMakeLists.txt b/DetDescr/CMakeLists.txt +--- a/DetDescr/CMakeLists.txt ++++ b/DetDescr/CMakeLists.txt +@@ -12,32 +12,27 @@ + option(BUILD_DETECTORID_BINDINGS "Build the python bindings for the the DetDescr/DetectorID components" ON) + if(BUILD_DETECTORID_BINDINGS) ++ cmake_policy(SET CMP0167 NEW) + find_package(Python COMPONENTS Development) + +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + # libboost_python3 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python${PYTHON_VERSION_MAJOR}") +- find_package(Boost QUIET COMPONENTS python${PYTHON_VERSION_MAJOR}) ++ message("Looking for libboost_python${Python_VERSION_MAJOR}") ++ find_package(Boost QUIET COMPONENTS python${Python_VERSION_MAJOR}) + endif() + +- # libboost_python style libraries +- if (NOT Boost_FOUND) +- message("Looking for libboost_python") +- find_package(Boost QUIET COMPONENTS system thread python) +- endif() +- + # libboost_python-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # libboost_python3-py36 style libraries + if (NOT Boost_FOUND) +- message("Looking for libboost_python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") +- find_package(Boost QUIET COMPONENTS python3-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ message("Looking for libboost_python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}") ++ find_package(Boost QUIET COMPONENTS python3-py${Python_VERSION_MAJOR}${Python_VERSION_MINOR}) + endif() + + # Nothing worked + if (NOT Boost_FOUND) +diff --git a/Hcal/src/Hcal/HcalClusterProducer.cxx b/Hcal/src/Hcal/HcalClusterProducer.cxx +--- a/Hcal/src/Hcal/HcalClusterProducer.cxx ++++ b/Hcal/src/Hcal/HcalClusterProducer.cxx +@@ -2,6 +2,7 @@ + + #include + #include ++#include + + #include "Hcal/MyClusterWeight.h" + #include "Recon/TemplatedClusterFinder.h" diff --git a/ci/interop/v4.7.3.patch b/ci/interop/v4.7.3.patch new file mode 120000 index 0000000..71a78c7 --- /dev/null +++ b/ci/interop/v4.7.3.patch @@ -0,0 +1 @@ +v4.6.5.patch \ No newline at end of file