git: 867e49b82ad9 - main - devel/root: Disable runtime_cxxmodules to avoid modulemap issues

From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Sat, 16 Nov 2024 08:32:56 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=867e49b82ad9850646f1c8114317ef50d38a1d2b

commit 867e49b82ad9850646f1c8114317ef50d38a1d2b
Author:     Erik Jensen <erik@tenku.dk>
AuthorDate: 2024-11-16 08:30:28 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-11-16 08:32:24 +0000

    devel/root: Disable runtime_cxxmodules to avoid modulemap issues
    
    A recent change in LLVM/Clang modulemap handling has caused ROOT (which builds
    its own patched version of LLVM/Clang for JIT C/C++ compilation, e.g. from the
    ROOT terminal) in the upstream source code to hack modulemap definitions on a
    case-by-case OS release-dependent basis on macOS, which also compiles ROOT with
    a LLVM/Clang compiler.
    Once a more robust solution has been found in the upstream code, we can revert
    to enabling 'runtime_cxxmodules' in the port.
    For now, my attempts at continually patching ROOT for FreeBSD 13.3+, 14.0+ and
    15.0 have proven too error-prone, and a package built on 14.0, for example, and
    distributed to both 14.0 and 14.1 would otherwise only work on 14.0 in the best
    of cases.
    
    PR:             282756
---
 devel/root/Makefile                                |  19 +-
 .../files/patch-core_clingutils_CMakeLists.txt     |  12 -
 .../patch-core_clingutils_src_TClingUtils.cxx      |  18 -
 ...interpreter_cling_lib_Interpreter_CIFactory.cpp |  28 --
 devel/root/pkg-plist                               | 453 +++++++++++++++------
 5 files changed, 348 insertions(+), 182 deletions(-)

diff --git a/devel/root/Makefile b/devel/root/Makefile
index 29480a41080b..aa522d8bf1f1 100644
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	root
 DISTVERSION=	6.32.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel science math parallel python
 MASTER_SITES=	https://root.cern/download/
 DISTFILES=	${PORTNAME}_v${DISTVERSION}.source${EXTRACT_SUFX}
@@ -12,6 +12,8 @@ WWW=		https://root.cern/
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL2_1.txt
 
+BROKEN_FreeBSD_15=	fails to build: Patch for newest CURRENT is missing
+
 BUILD_AND_RUN_DEPENDS=	bash:shells/bash \
 		nlohmann-json>=3:devel/nlohmann-json
 BUILD_DEPENDS=	${BUILD_AND_RUN_DEPENDS}
@@ -22,8 +24,7 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${BUILD_AND_RUN_DEPENDS}
 
-USES=		cmake compiler:c++17-lang desktop-file-utils \
-		iconv shebangfix
+USES=		cmake desktop-file-utils iconv shebangfix
 
 SHEBANG_FILES=	main/python/rootbrowse.py \
 		main/python/rootcp.py \
@@ -47,9 +48,8 @@ SHEBANG_FILES=	main/python/rootbrowse.py \
 python_OLD_CMD+=	"/usr/bin/env @python@"
 
 # Flags and environment variables for building
-CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_ON=	builtin_clang builtin_cling builtin_llvm builtin_openui5 gnuinstall \
-		rpath runtime_cxxmodules shared soversion
+		rpath shared soversion
 CMAKE_OFF=	arrow builtin_afterimage builtin_cfitsio builtin_cppzmq builtin_davix \
 		builtin_fftw3 builtin_freetype builtin_ftgl builtin_gl2ps builtin_glew \
 		builtin_gsl builtin_gtest builtin_lz4 builtin_lzma builtin_nlohmannjson \
@@ -58,8 +58,9 @@ CMAKE_OFF=	arrow builtin_afterimage builtin_cfitsio builtin_cppzmq builtin_davix
 		builtin_zstd cefweb clad cocoa cuda cudnn daos davix dcache fcgi fftw3 gviz \
 		libcxx llvm13_broken_tests macos_native memory_termination minuit2_mpi \
 		minuit2_omp mpi odbc proof pythia8 qt5web qt6web r roofit_multiprocess \
-		shadowpw test_distrdf_dask test_distrdf_pyspark tmva-gpu tmva-rmva tmva-sofie \
-		unfold unuran uring vc veccore vecgeom win_broken_tests winrtdebug
+		runtime_cxxmodules shadowpw test_distrdf_dask test_distrdf_pyspark tmva-gpu \
+		tmva-rmva tmva-sofie unfold unuran uring vc veccore vecgeom win_broken_tests \
+		winrtdebug
 
 # Port build options; DOCS also on by default
 # See https://root.cern/install/build_from_source/#all-build-options
@@ -204,9 +205,9 @@ PLIST_SUB+=	PYVER="${PYTHON_VER:S/./_/}" \
 
 # Some .modulemap, .pcm and .idx files are not installed on aarch64, a few headers are only installed on aarch64
 .if ${OPSYS} == FreeBSD && ${ARCH} == "aarch64"
-PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="@comment " ONLY_INSTALLED_ON_AARCH64=""
+PLIST_SUB+=	ONLY_INSTALLED_ON_AARCH64=""
 .else
-PLIST_SUB+=	NOT_INSTALLED_ON_AARCH64="" ONLY_INSTALLED_ON_AARCH64="@comment "
+PLIST_SUB+=	ONLY_INSTALLED_ON_AARCH64="@comment "
 .endif
 
 # Files in lib/root/__pycache__ have links into WRKDIR and should not be staged. This happens even when PYROOT option is OFF.
diff --git a/devel/root/files/patch-core_clingutils_CMakeLists.txt b/devel/root/files/patch-core_clingutils_CMakeLists.txt
deleted file mode 100644
index 97961aa0de84..000000000000
--- a/devel/root/files/patch-core_clingutils_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- core/clingutils/CMakeLists.txt.orig	2024-05-30 18:17:28 UTC
-+++ core/clingutils/CMakeLists.txt
-@@ -120,7 +120,8 @@ if (runtime_cxxmodules)
- 
-   # We need to override the default modulemap because instead of producing a
-   # single std.pcm, produces hundreds of pcms. This changed with sdk 15.3.
--  if (CMAKE_SYSTEM_NAME MATCHES Darwin AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0.0.15000309)
-+  if ((CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES FreeBSD) 
-+      AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 15.0.0.15000309)
-     set(custom_modulemaps ${custom_modulemaps} std_darwin.modulemap)
-   endif()
- 
diff --git a/devel/root/files/patch-core_clingutils_src_TClingUtils.cxx b/devel/root/files/patch-core_clingutils_src_TClingUtils.cxx
deleted file mode 100644
index 92992dfd133b..000000000000
--- a/devel/root/files/patch-core_clingutils_src_TClingUtils.cxx
+++ /dev/null
@@ -1,18 +0,0 @@
---- core/clingutils/src/TClingUtils.cxx.orig	2024-05-30 18:16:07 UTC
-+++ core/clingutils/src/TClingUtils.cxx
-@@ -3357,8 +3357,13 @@ std::string ROOT::TMetaUtils::GetFileName(const clang:
-       // we trace it back to the top-level system header that includes this
-       // declaration.
-       if (interp.getCI()->getLangOpts().Modules && !headerFE) {
--         assert(decl.isFirstDecl() && "Couldn't trace back include from a decl"
--                                      " that is not from an AST file");
-+        /*
-+         * FreeBSD port maintainer note: CMake option 'asserts' is enabled, when building ROOT with debug symbols.
-+         *                               Building then fails on this one assertion. We hack out the assertion, building
-+         *                               succeeds once again, and we pray that everything will be fine.
-+         */
-+         //assert(decl.isFirstDecl() && "Couldn't trace back include from a decl"
-+         //                             " that is not from an AST file");
-          assert(StringRef(includeLoc.printToString(sourceManager)).startswith("<module-includes>"));
-          break;
-       }
diff --git a/devel/root/files/patch-interpreter_cling_lib_Interpreter_CIFactory.cpp b/devel/root/files/patch-interpreter_cling_lib_Interpreter_CIFactory.cpp
deleted file mode 100644
index da248bc0918c..000000000000
--- a/devel/root/files/patch-interpreter_cling_lib_Interpreter_CIFactory.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- interpreter/cling/lib/Interpreter/CIFactory.cpp.orig	2024-06-24 15:02:26 UTC
-+++ interpreter/cling/lib/Interpreter/CIFactory.cpp
-@@ -699,6 +699,25 @@ namespace {
-                               clingIncLoc.str().str(), MOverlay,
-                               /*RegisterModuleMap=*/ true,
-                               /*AllowModulemapOverride=*/ false);
-+#elif __FreeBSD__
-+    auto fvMajor = Triple.getOSVersion().getMajor();
-+    auto fvMinor = Triple.getOSVersion().getMinor();
-+    // Same issue on FreeBSD 13.3+, 14.1+ and 15+ as introduced in MacOS sdk 15.3 ('core/clingutils/CMakeLists.txt')
-+    if ((fvMajor == 13 && fvMinor >= 3) || (fvMajor == 14 && fvMinor >= 1) || fvMajor >= 15) {
-+        maybeAppendOverlayEntry(stdIncLoc.str(), "std_darwin.modulemap",
-+                                clingIncLoc.str().str(), MOverlay,
-+                                /*RegisterModuleMap=*/ true,
-+                                /*AllowModulemapOverride=*/ false);
-+    } else {
-+        maybeAppendOverlayEntry(stdIncLoc.str(), "std.modulemap",
-+                                clingIncLoc.str().str(), MOverlay,
-+                                /*RegisterModuleMap=*/ true,
-+                                /*AllowModulemapOverride=*/true);
-+    }
-+    maybeAppendOverlayEntry(cIncLoc.str(), "libc.modulemap",
-+                            clingIncLoc.str().str(), MOverlay,
-+                            /*RegisterModuleMap=*/ true,
-+                            /*AllowModulemapOverride=*/true);
- #else
-     maybeAppendOverlayEntry(cIncLoc.str(), "libc.modulemap",
-                             clingIncLoc.str().str(), MOverlay,
diff --git a/devel/root/pkg-plist b/devel/root/pkg-plist
index 2ebc115408df..70706048c891 100644
--- a/devel/root/pkg-plist
+++ b/devel/root/pkg-plist
@@ -37,6 +37,7 @@ bin/thisroot.sh
 %%ETCDIR%%/RadioNuclides.txt
 %%ROOFIT%%%%ETCDIR%%/RooFitHS3_wsexportkeys.json
 %%ROOFIT%%%%ETCDIR%%/RooFitHS3_wsfactoryexpressions.json
+%%ETCDIR%%/allDict.cxx.pch
 %%ETCDIR%%/class.rules
 %%ETCDIR%%/cling/Interpreter/DynamicExprInfo.h
 %%ETCDIR%%/cling/Interpreter/DynamicLookupLifetimeHandler.h
@@ -47,10 +48,8 @@ bin/thisroot.sh
 %%ETCDIR%%/cling/Interpreter/RuntimeUniverse.h
 %%ETCDIR%%/cling/Interpreter/Value.h
 %%ETCDIR%%/cling/Interpreter/Visibility.h
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/boost.modulemap
 %%ETCDIR%%/cling/cint/multimap
 %%ETCDIR%%/cling/cint/multiset
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/cuda.modulemap
 %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_builtin_vars.h
 %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_cmath.h
 %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/__clang_cuda_complex_builtins.h
@@ -243,13 +242,156 @@ bin/thisroot.sh
 %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xsaveoptintrin.h
 %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xsavesintrin.h
 %%ETCDIR%%/cling/lib/clang/%%ROOT_CLANG_VER%%/include/xtestintrin.h
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/libc.modulemap
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/module.modulemap
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/std.modulemap
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/std_darwin.modulemap
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/tinyxml2.modulemap
-%%NOT_INSTALLED_ON_AARCH64%%%%ETCDIR%%/cling/vc.modulemap
+%%ETCDIR%%/dictpch/allCppflags.txt
+%%ETCDIR%%/dictpch/allHeaders.h
+%%ETCDIR%%/dictpch/allLinkDefs.h
+%%ETCDIR%%/dictpch/bindings/r/inc/LinkDef.h
+%%ETCDIR%%/dictpch/bindings/tpython/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/base/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/base/inc/LinkDef1.h
+%%ETCDIR%%/dictpch/core/base/inc/LinkDef2.h
+%%ETCDIR%%/dictpch/core/base/inc/LinkDef3.h
+%%ETCDIR%%/dictpch/core/cont/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/imt/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/macosx/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/meta/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/multiproc/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/rint/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/thread/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/unix/inc/LinkDef.h
+%%ETCDIR%%/dictpch/core/winnt/inc/LinkDef.h
+%%ETCDIR%%/dictpch/geom/gdml/inc/LinkDef.h
+%%ETCDIR%%/dictpch/geom/geom/inc/LinkDef.h
+%%ETCDIR%%/dictpch/geom/geom/inc/LinkDef1.h
+%%ETCDIR%%/dictpch/geom/geom/inc/LinkDef2.h
+%%ETCDIR%%/dictpch/geom/geombuilder/inc/LinkDef.h
+%%ETCDIR%%/dictpch/geom/geompainter/inc/LinkDef.h
+%%ETCDIR%%/dictpch/geom/vecgeom/inc/LinkDef.h
+%%ETCDIR%%/dictpch/geom/webviewer/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/asimage/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/asimage/inc/LinkDefGui.h
+%%ETCDIR%%/dictpch/graf2d/cocoa/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/fitsio/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/gpad/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/gpadv7/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/graf/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/gviz/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/postscript/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/primitivesv7/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/win32gdk/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/x11/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf2d/x11ttf/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf3d/csg/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf3d/eve/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf3d/eve/inc/LinkDef1.h
+%%ETCDIR%%/dictpch/graf3d/eve/inc/LinkDef2.h
+%%ETCDIR%%/dictpch/graf3d/eve7/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf3d/g3d/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf3d/gl/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf3d/gviz3d/inc/LinkDef.h
+%%ETCDIR%%/dictpch/graf3d/x3d/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/browsable/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/browserv7/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/fitpanel/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/fitpanelv7/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/ged/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/gui/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/guibuilder/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/guihtml/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/recorder/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/sessionviewer/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/webdisplay/inc/LinkDef.h
+%%ETCDIR%%/dictpch/gui/webgui6/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/hbook/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/hist/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/histdrawv7/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/histpainter/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/histv7/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/spectrum/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/spectrumpainter/inc/LinkDef.h
+%%ETCDIR%%/dictpch/hist/unfold/inc/LinkDef.h
+%%ETCDIR%%/dictpch/html/inc/LinkDef.h
+%%ETCDIR%%/dictpch/io/dcache/inc/LinkDef.h
+%%ETCDIR%%/dictpch/io/io/inc/LinkDef.h
+%%ETCDIR%%/dictpch/io/mpi/inc/LinkDef.h
+%%ETCDIR%%/dictpch/io/sql/inc/LinkDef.h
+%%ETCDIR%%/dictpch/io/xml/inc/LinkDef.h
+%%ETCDIR%%/dictpch/io/xmlparser/inc/LinkDef.h
 %%ETCDIR%%/dictpch/makepch.py
+%%ETCDIR%%/dictpch/math/fftw/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/foam/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/fumili/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/genetic/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVector.h
+%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVector2.h
+%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVector32.h
+%%ETCDIR%%/dictpch/math/genvector/inc/Math/LinkDef_GenVectorAll.h
+%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef1.h
+%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef2.h
+%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef3.h
+%%ETCDIR%%/dictpch/math/mathcore/inc/LinkDef_Func.h
+%%ETCDIR%%/dictpch/math/mathmore/inc/Math/LinkDef.h
+%%ETCDIR%%/dictpch/math/mathmore/inc/Math/LinkDef_Func.h
+%%ETCDIR%%/dictpch/math/mathmore/inc/Math/LinkDef_RootFinding.h
+%%ETCDIR%%/dictpch/math/matrix/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/minuit/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/minuit2/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/mlp/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/physics/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/quadp/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/rtools/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/smatrix/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/smatrix/inc/LinkDefAll.h
+%%ETCDIR%%/dictpch/math/smatrix/inc/LinkDefD32.h
+%%ETCDIR%%/dictpch/math/splot/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/unuran/inc/LinkDef.h
+%%ETCDIR%%/dictpch/math/vecops/inc/LinkDef.h
+%%ETCDIR%%/dictpch/montecarlo/eg/inc/LinkDef.h
+%%ETCDIR%%/dictpch/montecarlo/pythia8/inc/LinkDef.h
+%%ETCDIR%%/dictpch/net/auth/inc/LinkDefRoot.h
+%%ETCDIR%%/dictpch/net/davix/inc/LinkDef.h
+%%ETCDIR%%/dictpch/net/http/inc/LinkDef.h
+%%ETCDIR%%/dictpch/net/httpsniff/inc/LinkDef.h
+%%ETCDIR%%/dictpch/net/monalisa/inc/LinkDef.h
+%%ETCDIR%%/dictpch/net/net/inc/LinkDef.h
+%%ETCDIR%%/dictpch/net/netx/inc/LinkDef.h
+%%ETCDIR%%/dictpch/net/netxng/inc/LinkDef.h
+%%ETCDIR%%/dictpch/proof/proof/inc/LinkDef.h
+%%ETCDIR%%/dictpch/proof/proofbench/inc/LinkDef.h
+%%ETCDIR%%/dictpch/proof/proofplayer/inc/LinkDef.h
+%%ETCDIR%%/dictpch/proof/proofplayer/inc/LinkDefDraw.h
+%%ETCDIR%%/dictpch/proof/proofx/inc/LinkDef.h
+%%ETCDIR%%/dictpch/roofit/RDataFrameHelpers/inc/LinkDef.h
+%%ETCDIR%%/dictpch/roofit/histfactory/inc/LinkDef.h
+%%ETCDIR%%/dictpch/roofit/roofit/inc/LinkDef1.h
+%%ETCDIR%%/dictpch/roofit/roofitcore/inc/LinkDef.h
+%%ETCDIR%%/dictpch/roofit/roofitmore/inc/LinkDef.h
+%%ETCDIR%%/dictpch/roofit/roostats/inc/LinkDef.h
+%%ETCDIR%%/dictpch/roofit/xroofit/inc/LinkDef.h
+%%ETCDIR%%/dictpch/sql/mysql/inc/LinkDef.h
+%%ETCDIR%%/dictpch/sql/odbc/inc/LinkDef.h
+%%ETCDIR%%/dictpch/sql/pgsql/inc/LinkDef.h
+%%ETCDIR%%/dictpch/sql/sqlite/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tmva/pymva/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tmva/rmva/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tmva/sofie/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tmva/sofie_parsers/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef1.h
+%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef2.h
+%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef3.h
+%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef4.h
+%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDef5.h
+%%ETCDIR%%/dictpch/tmva/tmva/inc/LinkDefUtils.h
+%%ETCDIR%%/dictpch/tmva/tmvagui/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tree/dataframe/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tree/ntuple/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tree/ntupleutil/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tree/tree/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tree/treeplayer/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tree/treeviewer/inc/LinkDef.h
+%%ETCDIR%%/dictpch/tree/webviewer/inc/LinkDef.h
 %%ETCDIR%%/gdb-backtrace.sh
 %%ETCDIR%%/gitinfo.txt
 %%ETCDIR%%/helgrind-root.supp
@@ -2981,11 +3123,6 @@ include/root/strtok.h
 include/root/v5/TF1Data.h
 include/root/v5/TFormula.h
 include/root/v5/TFormulaPrimitive.h
-%%ASIMAGE%%lib/root/ASImage.pcm
-%%ASIMAGE%%lib/root/ASImageGui.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/Cling_Runtime.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/Cling_Runtime_Extra.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/Core.pcm
 %%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Base.py
 %%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/Backend.py
 %%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/Backends/Dask/__init__.py
@@ -3040,34 +3177,6 @@ include/root/v5/TFormulaPrimitive.h
 %%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/_graph_cache%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/__pycache__/_graph_cache%%PYTHON_EXT_SUFFIX%%.pyc
 %%DATAFRAME%%%%PYROOT%%lib/root/DistRDF/_graph_cache.py
-lib/root/EG.pcm
-%%OPENGL%%lib/root/Eve.pcm
-%%FITS%%lib/root/FITSIO.pcm
-lib/root/FitPanel.pcm
-lib/root/Foam.pcm
-lib/root/Fumili.pcm
-%%X11%%lib/root/GX11.pcm
-%%X11%%lib/root/GX11TTF.pcm
-%%GDML%%lib/root/Gdml.pcm
-lib/root/Ged.pcm
-lib/root/GenVector.pcm
-%%TMVAML%%lib/root/Genetic.pcm
-lib/root/Geom.pcm
-lib/root/GeomBuilder.pcm
-lib/root/GeomPainter.pcm
-lib/root/Gpad.pcm
-lib/root/Graf.pcm
-lib/root/Graf3d.pcm
-lib/root/Gui.pcm
-lib/root/GuiBld.pcm
-lib/root/GuiHtml.pcm
-%%OPENGL%%lib/root/Gviz3d.pcm
-%%FORTRAN%%lib/root/Hbook.pcm
-lib/root/Hist.pcm
-%%ROOFIT%%lib/root/HistFactory.pcm
-lib/root/HistPainter.pcm
-lib/root/Html.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/Imt.pcm
 %%PYROOT%%lib/root/JupyROOT/__init__.py
 %%PYROOT%%lib/root/JupyROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYROOT%%lib/root/JupyROOT/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -3116,26 +3225,6 @@ lib/root/Html.pcm
 %%PYROOT%%lib/root/JupyROOT/magics/__pycache__/jsrootmagic%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYROOT%%lib/root/JupyROOT/magics/cppmagic.py
 %%PYROOT%%lib/root/JupyROOT/magics/jsrootmagic.py
-lib/root/MLP.pcm
-lib/root/MathCore.pcm
-%%MATHMORE%%lib/root/MathMore.pcm
-lib/root/Matrix.pcm
-lib/root/Minuit.pcm
-lib/root/Minuit2.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/MultiProc.pcm
-lib/root/Net.pcm
-%%XROOTD%%lib/root/NetxNG.pcm
-%%PGSQL%%lib/root/PgSQL.pcm
-lib/root/Physics.pcm
-lib/root/Postscript.pcm
-%%TMVAML%%%%PYROOT%%lib/root/PyMVA.pcm
-lib/root/Quadp.pcm
-lib/root/RCsg.pcm
-%%OPENGL%%lib/root/RGL.pcm
-%%HTTP%%lib/root/RHTTP.pcm
-%%HTTP%%lib/root/RHTTPSniff.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/RIO.pcm
-%%MYSQL%%lib/root/RMySQL.pcm
 %%PYROOT%%lib/root/ROOT/JsMVA/DataLoader.py
 %%PYROOT%%lib/root/ROOT/JsMVA/Factory.py
 %%PYROOT%%lib/root/ROOT/JsMVA/JPyInterface.py
@@ -3373,57 +3462,6 @@ lib/root/RCsg.pcm
 %%PYROOT%%lib/root/ROOT/_pythonization/_ttree.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_tvector3.py
 %%PYROOT%%lib/root/ROOT/_pythonization/_tvectort.py
-%%HTTP%%%%ROOT7%%lib/root/ROOTBrowsable.pcm
-%%HTTP%%%%ROOT7%%lib/root/ROOTBrowserv7.pcm
-%%DATAFRAME%%lib/root/ROOTDataFrame.pcm
-%%HTTP%%%%ROOT7%%lib/root/ROOTEve.pcm
-%%HTTP%%%%ROOT7%%lib/root/ROOTFitPanelv7.pcm
-%%HTTP%%%%ROOT7%%lib/root/ROOTGeomViewer.pcm
-%%ROOT7%%lib/root/ROOTGpadv7.pcm
-%%ROOT7%%lib/root/ROOTGraphicsPrimitives.pcm
-%%ROOT7%%lib/root/ROOTHist.pcm
-%%ROOT7%%lib/root/ROOTHistDraw.pcm
-%%ROOT7%%lib/root/ROOTNTuple.pcm
-%%ROOT7%%lib/root/ROOTNTupleUtil.pcm
-%%TMVAML%%lib/root/ROOTTMVASofie.pcm
-%%PYROOT%%lib/root/ROOTTPython.pcm
-%%HTTP%%lib/root/ROOTTreeViewer.pcm
-lib/root/ROOTVecOps.pcm
-%%HTTP%%lib/root/ROOTWebDisplay.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Config.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Foundation_C.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Foundation_Stage1_NoRTTI.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/ROOT_Rtypes.pcm
-%%SQLITE%%lib/root/RSQLite.pcm
-lib/root/Recorder.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/Rint.pcm
-%%ROOFIT%%lib/root/RooFit.pcm
-%%ROOFIT%%lib/root/RooFitCore.pcm
-%%ROOFIT%%lib/root/RooFitHS3.pcm
-%%ROOFIT%%lib/root/RooFitJSONInterface.pcm
-%%MATHMORE%%%%ROOFIT%%lib/root/RooFitMore.pcm
-%%ROOFIT%%%%DATAFRAME%%lib/root/RooFitRDataFrameHelpers.pcm
-%%ROOFIT%%%%ROOT7%%lib/root/RooFitXRooFit.pcm
-%%ROOFIT%%lib/root/RooStats.pcm
-lib/root/RootAuth.pcm
-lib/root/SPlot.pcm
-lib/root/SQLIO.pcm
-lib/root/Smatrix.pcm
-%%SPECTRUM%%lib/root/Spectrum.pcm
-%%SPECTRUM%%lib/root/SpectrumPainter.pcm
-%%TMVAML%%lib/root/TMVA.pcm
-%%TMVAML%%lib/root/TMVAGui.pcm
-%%TMVAML%%%%DATAFRAME%%lib/root/TMVAUtils.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/Thread.pcm
-lib/root/Tree.pcm
-lib/root/TreePlayer.pcm
-lib/root/TreeViewer.pcm
-%%HTTP%%lib/root/WebGui6.pcm
-%%X11%%lib/root/X3d.pcm
-lib/root/XMLIO.pcm
-%%XML%%lib/root/XMLParser.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/_Builtin_intrinsics.pcm
-%%NOT_INSTALLED_ON_AARCH64%%lib/root/_Builtin_stddef_max_align_t.pcm
 lib/root/cmdLineUtils.py
 %%PYROOT%%lib/root/cppyy/__init__.py
 %%PYROOT%%lib/root/cppyy/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
@@ -3487,172 +3525,273 @@ lib/root/cmdLineUtils.py
 %%PYROOT%%lib/root/cppyy_backend/_rootcling.py
 %%PYROOT%%lib/root/cppyy_backend/bindings_utils.py
 %%PYROOT%%lib/root/cppyy_backend/loader.py
+%%ASIMAGE%%lib/root/libASImage.rootmap
 %%ASIMAGE%%lib/root/libASImage.so
 %%ASIMAGE%%lib/root/libASImage.so.%%SHLIB_SHVER%%
 %%ASIMAGE%%lib/root/libASImage.so.%%SHLIB_VER%%
+%%ASIMAGE%%lib/root/libASImageGui.rootmap
 %%ASIMAGE%%lib/root/libASImageGui.so
 %%ASIMAGE%%lib/root/libASImageGui.so.%%SHLIB_SHVER%%
 %%ASIMAGE%%lib/root/libASImageGui.so.%%SHLIB_VER%%
+%%ASIMAGE%%lib/root/libASImageGui_rdict.pcm
+%%ASIMAGE%%lib/root/libASImage_rdict.pcm
 lib/root/libCling.so
 lib/root/libCling.so.%%SHLIB_SHVER%%
 lib/root/libCling.so.%%SHLIB_VER%%
+lib/root/libCore.rootmap
 lib/root/libCore.so
 lib/root/libCore.so.%%SHLIB_SHVER%%
 lib/root/libCore.so.%%SHLIB_VER%%
+lib/root/libEG.rootmap
 lib/root/libEG.so
 lib/root/libEG.so.%%SHLIB_SHVER%%
 lib/root/libEG.so.%%SHLIB_VER%%
+lib/root/libEG_rdict.pcm
+%%OPENGL%%lib/root/libEve.rootmap
 %%OPENGL%%lib/root/libEve.so
 %%OPENGL%%lib/root/libEve.so.%%SHLIB_SHVER%%
 %%OPENGL%%lib/root/libEve.so.%%SHLIB_VER%%
+%%OPENGL%%lib/root/libEve_rdict.pcm
+%%FITS%%lib/root/libFITSIO.rootmap
 %%FITS%%lib/root/libFITSIO.so
 %%FITS%%lib/root/libFITSIO.so.%%SHLIB_SHVER%%
 %%FITS%%lib/root/libFITSIO.so.%%SHLIB_VER%%
+%%FITS%%lib/root/libFITSIO_rdict.pcm
+lib/root/libFitPanel.rootmap
 lib/root/libFitPanel.so
 lib/root/libFitPanel.so.%%SHLIB_SHVER%%
 lib/root/libFitPanel.so.%%SHLIB_VER%%
+lib/root/libFitPanel_rdict.pcm
+lib/root/libFoam.rootmap
 lib/root/libFoam.so
 lib/root/libFoam.so.%%SHLIB_SHVER%%
 lib/root/libFoam.so.%%SHLIB_VER%%
+lib/root/libFoam_rdict.pcm
+lib/root/libFumili.rootmap
 lib/root/libFumili.so
 lib/root/libFumili.so.%%SHLIB_SHVER%%
 lib/root/libFumili.so.%%SHLIB_VER%%
+lib/root/libFumili_rdict.pcm
+%%X11%%lib/root/libGX11.rootmap
 %%X11%%lib/root/libGX11.so
 %%X11%%lib/root/libGX11.so.%%SHLIB_SHVER%%
 %%X11%%lib/root/libGX11.so.%%SHLIB_VER%%
+%%X11%%lib/root/libGX11TTF.rootmap
 %%X11%%lib/root/libGX11TTF.so
 %%X11%%lib/root/libGX11TTF.so.%%SHLIB_SHVER%%
 %%X11%%lib/root/libGX11TTF.so.%%SHLIB_VER%%
+%%X11%%lib/root/libGX11TTF_rdict.pcm
+%%X11%%lib/root/libGX11_rdict.pcm
+%%GDML%%lib/root/libGdml.rootmap
 %%GDML%%lib/root/libGdml.so
 %%GDML%%lib/root/libGdml.so.%%SHLIB_SHVER%%
 %%GDML%%lib/root/libGdml.so.%%SHLIB_VER%%
+%%GDML%%lib/root/libGdml_rdict.pcm
+lib/root/libGed.rootmap
 lib/root/libGed.so
 lib/root/libGed.so.%%SHLIB_SHVER%%
 lib/root/libGed.so.%%SHLIB_VER%%
+lib/root/libGed_rdict.pcm
+lib/root/libGenVector.rootmap
 lib/root/libGenVector.so
 lib/root/libGenVector.so.%%SHLIB_SHVER%%
 lib/root/libGenVector.so.%%SHLIB_VER%%
+lib/root/libGenVector_G__GenVector32_rdict.pcm
+lib/root/libGenVector_rdict.pcm
 lib/root/libGenVector32.rootmap
+%%TMVAML%%lib/root/libGenetic.rootmap
 %%TMVAML%%lib/root/libGenetic.so
 %%TMVAML%%lib/root/libGenetic.so.%%SHLIB_SHVER%%
 %%TMVAML%%lib/root/libGenetic.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libGenetic_rdict.pcm
+lib/root/libGeom.rootmap
 lib/root/libGeom.so
 lib/root/libGeom.so.%%SHLIB_SHVER%%
 lib/root/libGeom.so.%%SHLIB_VER%%
+lib/root/libGeomBuilder.rootmap
 lib/root/libGeomBuilder.so
 lib/root/libGeomBuilder.so.%%SHLIB_SHVER%%
 lib/root/libGeomBuilder.so.%%SHLIB_VER%%
+lib/root/libGeomBuilder_rdict.pcm
+lib/root/libGeomPainter.rootmap
 lib/root/libGeomPainter.so
 lib/root/libGeomPainter.so.%%SHLIB_SHVER%%
 lib/root/libGeomPainter.so.%%SHLIB_VER%%
+lib/root/libGeomPainter_rdict.pcm
+lib/root/libGeom_rdict.pcm
+lib/root/libGpad.rootmap
 lib/root/libGpad.so
 lib/root/libGpad.so.%%SHLIB_SHVER%%
 lib/root/libGpad.so.%%SHLIB_VER%%
+lib/root/libGpad_rdict.pcm
+lib/root/libGraf.rootmap
 lib/root/libGraf.so
 lib/root/libGraf.so.%%SHLIB_SHVER%%
 lib/root/libGraf.so.%%SHLIB_VER%%
+lib/root/libGraf3d.rootmap
 lib/root/libGraf3d.so
 lib/root/libGraf3d.so.%%SHLIB_SHVER%%
 lib/root/libGraf3d.so.%%SHLIB_VER%%
+lib/root/libGraf3d_rdict.pcm
+lib/root/libGraf_rdict.pcm
+lib/root/libGui.rootmap
 lib/root/libGui.so
 lib/root/libGui.so.%%SHLIB_SHVER%%
 lib/root/libGui.so.%%SHLIB_VER%%
+lib/root/libGuiBld.rootmap
 lib/root/libGuiBld.so
 lib/root/libGuiBld.so.%%SHLIB_SHVER%%
 lib/root/libGuiBld.so.%%SHLIB_VER%%
+lib/root/libGuiBld_rdict.pcm
+lib/root/libGuiHtml.rootmap
 lib/root/libGuiHtml.so
 lib/root/libGuiHtml.so.%%SHLIB_SHVER%%
 lib/root/libGuiHtml.so.%%SHLIB_VER%%
+lib/root/libGuiHtml_rdict.pcm
+lib/root/libGui_rdict.pcm
+%%OPENGL%%lib/root/libGviz3d.rootmap
 %%OPENGL%%lib/root/libGviz3d.so
 %%OPENGL%%lib/root/libGviz3d.so.%%SHLIB_SHVER%%
 %%OPENGL%%lib/root/libGviz3d.so.%%SHLIB_VER%%
+%%OPENGL%%lib/root/libGviz3d_rdict.pcm
+%%FORTRAN%%lib/root/libHbook.rootmap
 %%FORTRAN%%lib/root/libHbook.so
 %%FORTRAN%%lib/root/libHbook.so.%%SHLIB_SHVER%%
 %%FORTRAN%%lib/root/libHbook.so.%%SHLIB_VER%%
+%%FORTRAN%%lib/root/libHbook_rdict.pcm
+lib/root/libHist.rootmap
 lib/root/libHist.so
 lib/root/libHist.so.%%SHLIB_SHVER%%
 lib/root/libHist.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libHistFactory.rootmap
 %%ROOFIT%%lib/root/libHistFactory.so
 %%ROOFIT%%lib/root/libHistFactory.so.%%SHLIB_SHVER%%
 %%ROOFIT%%lib/root/libHistFactory.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libHistFactory_rdict.pcm
+lib/root/libHistPainter.rootmap
 lib/root/libHistPainter.so
 lib/root/libHistPainter.so.%%SHLIB_SHVER%%
 lib/root/libHistPainter.so.%%SHLIB_VER%%
+lib/root/libHistPainter_rdict.pcm
+lib/root/libHist_rdict.pcm
+lib/root/libHtml.rootmap
 lib/root/libHtml.so
 lib/root/libHtml.so.%%SHLIB_SHVER%%
 lib/root/libHtml.so.%%SHLIB_VER%%
+lib/root/libHtml_rdict.pcm
+lib/root/libImt.rootmap
 lib/root/libImt.so
 lib/root/libImt.so.%%SHLIB_SHVER%%
 lib/root/libImt.so.%%SHLIB_VER%%
+lib/root/libMLP.rootmap
 lib/root/libMLP.so
 lib/root/libMLP.so.%%SHLIB_SHVER%%
 lib/root/libMLP.so.%%SHLIB_VER%%
+lib/root/libMLP_rdict.pcm
+lib/root/libMathCore.rootmap
 lib/root/libMathCore.so
 lib/root/libMathCore.so.%%SHLIB_SHVER%%
 lib/root/libMathCore.so.%%SHLIB_VER%%
+lib/root/libMathCore_rdict.pcm
+%%MATHMORE%%lib/root/libMathMore.rootmap
 %%MATHMORE%%lib/root/libMathMore.so
 %%MATHMORE%%lib/root/libMathMore.so.%%SHLIB_SHVER%%
 %%MATHMORE%%lib/root/libMathMore.so.%%SHLIB_VER%%
+%%MATHMORE%%lib/root/libMathMore_rdict.pcm
+lib/root/libMatrix.rootmap
 lib/root/libMatrix.so
 lib/root/libMatrix.so.%%SHLIB_SHVER%%
 lib/root/libMatrix.so.%%SHLIB_VER%%
+lib/root/libMatrix_rdict.pcm
+lib/root/libMinuit.rootmap
 lib/root/libMinuit.so
 lib/root/libMinuit.so.%%SHLIB_SHVER%%
 lib/root/libMinuit.so.%%SHLIB_VER%%
+lib/root/libMinuit2.rootmap
 lib/root/libMinuit2.so
 lib/root/libMinuit2.so.%%SHLIB_SHVER%%
 lib/root/libMinuit2.so.%%SHLIB_VER%%
+lib/root/libMinuit2_rdict.pcm
+lib/root/libMinuit_rdict.pcm
+lib/root/libMultiProc.rootmap
 lib/root/libMultiProc.so
 lib/root/libMultiProc.so.%%SHLIB_SHVER%%
 lib/root/libMultiProc.so.%%SHLIB_VER%%
+lib/root/libNet.rootmap
 lib/root/libNet.so
 lib/root/libNet.so.%%SHLIB_SHVER%%
 lib/root/libNet.so.%%SHLIB_VER%%
+lib/root/libNet_rdict.pcm
+%%XROOTD%%lib/root/libNetxNG.rootmap
 %%XROOTD%%lib/root/libNetxNG.so
 %%XROOTD%%lib/root/libNetxNG.so.%%SHLIB_SHVER%%
 %%XROOTD%%lib/root/libNetxNG.so.%%SHLIB_VER%%
+%%XROOTD%%lib/root/libNetxNG_rdict.pcm
 lib/root/libNew.so
 lib/root/libNew.so.%%SHLIB_SHVER%%
 lib/root/libNew.so.%%SHLIB_VER%%
+%%PGSQL%%lib/root/libPgSQL.rootmap
 %%PGSQL%%lib/root/libPgSQL.so
 %%PGSQL%%lib/root/libPgSQL.so.%%SHLIB_SHVER%%
 %%PGSQL%%lib/root/libPgSQL.so.%%SHLIB_VER%%
+%%PGSQL%%lib/root/libPgSQL_rdict.pcm
+lib/root/libPhysics.rootmap
 lib/root/libPhysics.so
 lib/root/libPhysics.so.%%SHLIB_SHVER%%
 lib/root/libPhysics.so.%%SHLIB_VER%%
+lib/root/libPhysics_rdict.pcm
+lib/root/libPostscript.rootmap
 lib/root/libPostscript.so
 lib/root/libPostscript.so.%%SHLIB_SHVER%%
 lib/root/libPostscript.so.%%SHLIB_VER%%
+lib/root/libPostscript_rdict.pcm
+%%TMVAML%%%%PYROOT%%lib/root/libPyMVA.rootmap
 %%TMVAML%%%%PYROOT%%lib/root/libPyMVA.so
 %%TMVAML%%%%PYROOT%%lib/root/libPyMVA.so.%%SHLIB_SHVER%%
 %%TMVAML%%%%PYROOT%%lib/root/libPyMVA.so.%%SHLIB_VER%%
+%%TMVAML%%%%PYROOT%%lib/root/libPyMVA_rdict.pcm
+lib/root/libQuadp.rootmap
 lib/root/libQuadp.so
 lib/root/libQuadp.so.%%SHLIB_SHVER%%
 lib/root/libQuadp.so.%%SHLIB_VER%%
+lib/root/libQuadp_rdict.pcm
+lib/root/libRCsg.rootmap
 lib/root/libRCsg.so
 lib/root/libRCsg.so.%%SHLIB_SHVER%%
 lib/root/libRCsg.so.%%SHLIB_VER%%
+lib/root/libRCsg_rdict.pcm
+%%OPENGL%%lib/root/libRGL.rootmap
 %%OPENGL%%lib/root/libRGL.so
 %%OPENGL%%lib/root/libRGL.so.%%SHLIB_SHVER%%
 %%OPENGL%%lib/root/libRGL.so.%%SHLIB_VER%%
+%%OPENGL%%lib/root/libRGL_rdict.pcm
+%%HTTP%%lib/root/libRHTTP.rootmap
 %%HTTP%%lib/root/libRHTTP.so
 %%HTTP%%lib/root/libRHTTP.so.%%SHLIB_SHVER%%
 %%HTTP%%lib/root/libRHTTP.so.%%SHLIB_VER%%
+%%HTTP%%lib/root/libRHTTPSniff.rootmap
 %%HTTP%%lib/root/libRHTTPSniff.so
 %%HTTP%%lib/root/libRHTTPSniff.so.%%SHLIB_SHVER%%
 %%HTTP%%lib/root/libRHTTPSniff.so.%%SHLIB_VER%%
+%%HTTP%%lib/root/libRHTTPSniff_rdict.pcm
+%%HTTP%%lib/root/libRHTTP_rdict.pcm
+lib/root/libRIO.rootmap
 lib/root/libRIO.so
 lib/root/libRIO.so.%%SHLIB_SHVER%%
 lib/root/libRIO.so.%%SHLIB_VER%%
+%%MYSQL%%lib/root/libRMySQL.rootmap
 %%MYSQL%%lib/root/libRMySQL.so
 %%MYSQL%%lib/root/libRMySQL.so.%%SHLIB_SHVER%%
 %%MYSQL%%lib/root/libRMySQL.so.%%SHLIB_VER%%
+%%MYSQL%%lib/root/libRMySQL_rdict.pcm
 %%HTTP%%%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTBranchBrowseProvider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable.rootmap
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowsable_rdict.pcm
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserGeomWidget.so.%%SHLIB_VER%%
@@ -3668,39 +3807,57 @@ lib/root/libRIO.so.%%SHLIB_VER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserWidgets.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserWidgets.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserWidgets.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7.rootmap
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTBrowserv7_rdict.pcm
 %%HTTP%%%%ROOT7%%lib/root/libROOTCanvasPainter.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTCanvasPainter.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTCanvasPainter.so.%%SHLIB_VER%%
+%%DATAFRAME%%lib/root/libROOTDataFrame.rootmap
 %%DATAFRAME%%lib/root/libROOTDataFrame.so
 %%DATAFRAME%%lib/root/libROOTDataFrame.so.%%SHLIB_SHVER%%
 %%DATAFRAME%%lib/root/libROOTDataFrame.so.%%SHLIB_VER%%
+%%DATAFRAME%%lib/root/libROOTDataFrame_rdict.pcm
+%%HTTP%%%%ROOT7%%lib/root/libROOTEve.rootmap
 %%HTTP%%%%ROOT7%%lib/root/libROOTEve.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTEve.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTEve.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTEve_rdict.pcm
+%%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7.rootmap
 %%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTFitPanelv7_rdict.pcm
 %%HTTP%%%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTGeoBrowseProvider.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer.rootmap
 %%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer.so.%%SHLIB_VER%%
+%%HTTP%%%%ROOT7%%lib/root/libROOTGeomViewer_rdict.pcm
+%%ROOT7%%lib/root/libROOTGpadv7.rootmap
 %%ROOT7%%lib/root/libROOTGpadv7.so
 %%ROOT7%%lib/root/libROOTGpadv7.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTGpadv7.so.%%SHLIB_VER%%
+%%ROOT7%%lib/root/libROOTGpadv7_rdict.pcm
+%%ROOT7%%lib/root/libROOTGraphicsPrimitives.rootmap
 %%ROOT7%%lib/root/libROOTGraphicsPrimitives.so
 %%ROOT7%%lib/root/libROOTGraphicsPrimitives.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTGraphicsPrimitives.so.%%SHLIB_VER%%
+%%ROOT7%%lib/root/libROOTGraphicsPrimitives_rdict.pcm
+%%ROOT7%%lib/root/libROOTHist.rootmap
 %%ROOT7%%lib/root/libROOTHist.so
 %%ROOT7%%lib/root/libROOTHist.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTHist.so.%%SHLIB_VER%%
+%%ROOT7%%lib/root/libROOTHistDraw.rootmap
 %%ROOT7%%lib/root/libROOTHistDraw.so
 %%ROOT7%%lib/root/libROOTHistDraw.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTHistDraw.so.%%SHLIB_VER%%
+%%ROOT7%%lib/root/libROOTHistDraw_rdict.pcm
+%%ROOT7%%lib/root/libROOTHist_rdict.pcm
 %%HTTP%%%%ROOT7%%lib/root/libROOTHistDrawProvider.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTHistDrawProvider.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTHistDrawProvider.so.%%SHLIB_VER%%
@@ -3710,6 +3867,7 @@ lib/root/libRIO.so.%%SHLIB_VER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTLeafDraw7Provider.so.%%SHLIB_VER%%
+%%ROOT7%%lib/root/libROOTNTuple.rootmap
 %%ROOT7%%lib/root/libROOTNTuple.so
 %%ROOT7%%lib/root/libROOTNTuple.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTNTuple.so.%%SHLIB_VER%%
@@ -3722,9 +3880,12 @@ lib/root/libRIO.so.%%SHLIB_VER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTNTupleDraw7Provider.so.%%SHLIB_VER%%
+%%ROOT7%%lib/root/libROOTNTupleUtil.rootmap
 %%ROOT7%%lib/root/libROOTNTupleUtil.so
 %%ROOT7%%lib/root/libROOTNTupleUtil.so.%%SHLIB_SHVER%%
 %%ROOT7%%lib/root/libROOTNTupleUtil.so.%%SHLIB_VER%%
+%%ROOT7%%lib/root/libROOTNTupleUtil_rdict.pcm
+%%ROOT7%%lib/root/libROOTNTuple_rdict.pcm
 %%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so
 %%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so.%%SHLIB_SHVER%%
 %%HTTP%%%%ROOT7%%lib/root/libROOTObjectDraw6Provider.so.%%SHLIB_VER%%
@@ -3734,27 +3895,42 @@ lib/root/libRIO.so.%%SHLIB_VER%%
 %%PYROOT%%lib/root/libROOTPythonizations.so
 %%PYROOT%%lib/root/libROOTPythonizations.so.%%SHLIB_SHVER%%
 %%PYROOT%%lib/root/libROOTPythonizations.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libROOTTMVASofie.rootmap
 %%TMVAML%%lib/root/libROOTTMVASofie.so
 %%TMVAML%%lib/root/libROOTTMVASofie.so.%%SHLIB_SHVER%%
 %%TMVAML%%lib/root/libROOTTMVASofie.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libROOTTMVASofie_rdict.pcm
+%%PYROOT%%lib/root/libROOTTPython.rootmap
 %%PYROOT%%lib/root/libROOTTPython.so
 %%PYROOT%%lib/root/libROOTTPython.so.%%SHLIB_SHVER%%
 %%PYROOT%%lib/root/libROOTTPython.so.%%SHLIB_VER%%
+%%PYROOT%%lib/root/libROOTTPython_rdict.pcm
+%%HTTP%%lib/root/libROOTTreeViewer.rootmap
 %%HTTP%%lib/root/libROOTTreeViewer.so
 %%HTTP%%lib/root/libROOTTreeViewer.so.%%SHLIB_SHVER%%
 %%HTTP%%lib/root/libROOTTreeViewer.so.%%SHLIB_VER%%
+%%HTTP%%lib/root/libROOTTreeViewer_rdict.pcm
+lib/root/libROOTVecOps.rootmap
 lib/root/libROOTVecOps.so
 lib/root/libROOTVecOps.so.%%SHLIB_SHVER%%
 lib/root/libROOTVecOps.so.%%SHLIB_VER%%
+lib/root/libROOTVecOps_rdict.pcm
+%%HTTP%%lib/root/libROOTWebDisplay.rootmap
 %%HTTP%%lib/root/libROOTWebDisplay.so
 %%HTTP%%lib/root/libROOTWebDisplay.so.%%SHLIB_SHVER%%
 %%HTTP%%lib/root/libROOTWebDisplay.so.%%SHLIB_VER%%
+%%HTTP%%lib/root/libROOTWebDisplay_rdict.pcm
+%%SQLITE%%lib/root/libRSQLite.rootmap
 %%SQLITE%%lib/root/libRSQLite.so
 %%SQLITE%%lib/root/libRSQLite.so.%%SHLIB_SHVER%%
 %%SQLITE%%lib/root/libRSQLite.so.%%SHLIB_VER%%
+%%SQLITE%%lib/root/libRSQLite_rdict.pcm
+lib/root/libRecorder.rootmap
 lib/root/libRecorder.so
 lib/root/libRecorder.so.%%SHLIB_SHVER%%
 lib/root/libRecorder.so.%%SHLIB_VER%%
+lib/root/libRecorder_rdict.pcm
+lib/root/libRint.rootmap
 lib/root/libRint.so
 lib/root/libRint.so.%%SHLIB_SHVER%%
 lib/root/libRint.so.%%SHLIB_VER%%
@@ -3764,86 +3940,135 @@ lib/root/libRint.so.%%SHLIB_VER%%
 %%ROOFIT%%lib/root/libRooBatchCompute_GENERIC.so
 %%ROOFIT%%lib/root/libRooBatchCompute_GENERIC.so.%%SHLIB_SHVER%%
 %%ROOFIT%%lib/root/libRooBatchCompute_GENERIC.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFit.rootmap
 %%ROOFIT%%lib/root/libRooFit.so
 %%ROOFIT%%lib/root/libRooFit.so.%%SHLIB_SHVER%%
 %%ROOFIT%%lib/root/libRooFit.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFitCore.rootmap
 %%ROOFIT%%lib/root/libRooFitCore.so
 %%ROOFIT%%lib/root/libRooFitCore.so.%%SHLIB_SHVER%%
 %%ROOFIT%%lib/root/libRooFitCore.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFitCore_rdict.pcm
+%%ROOFIT%%lib/root/libRooFitHS3.rootmap
 %%ROOFIT%%lib/root/libRooFitHS3.so
 %%ROOFIT%%lib/root/libRooFitHS3.so.%%SHLIB_SHVER%%
 %%ROOFIT%%lib/root/libRooFitHS3.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFitHS3_rdict.pcm
+%%ROOFIT%%lib/root/libRooFitJSONInterface.rootmap
 %%ROOFIT%%lib/root/libRooFitJSONInterface.so
 %%ROOFIT%%lib/root/libRooFitJSONInterface.so.%%SHLIB_SHVER%%
 %%ROOFIT%%lib/root/libRooFitJSONInterface.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooFitJSONInterface_rdict.pcm
+%%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore.rootmap
 %%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore.so
 %%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore.so.%%SHLIB_SHVER%%
 %%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore.so.%%SHLIB_VER%%
+%%MATHMORE%%%%ROOFIT%%lib/root/libRooFitMore_rdict.pcm
+%%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers.rootmap
 %%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers.so
 %%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers.so.%%SHLIB_SHVER%%
 %%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers.so.%%SHLIB_VER%%
+%%ROOFIT%%%%DATAFRAME%%lib/root/libRooFitRDataFrameHelpers_rdict.pcm
+%%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit.rootmap
 %%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit.so
 %%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit.so.%%SHLIB_SHVER%%
 %%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit.so.%%SHLIB_VER%%
+%%ROOFIT%%%%ROOT7%%lib/root/libRooFitXRooFit_rdict.pcm
+%%ROOFIT%%lib/root/libRooFit_rdict.pcm
+%%ROOFIT%%lib/root/libRooStats.rootmap
 %%ROOFIT%%lib/root/libRooStats.so
 %%ROOFIT%%lib/root/libRooStats.so.%%SHLIB_SHVER%%
 %%ROOFIT%%lib/root/libRooStats.so.%%SHLIB_VER%%
+%%ROOFIT%%lib/root/libRooStats_rdict.pcm
+lib/root/libRootAuth.rootmap
 lib/root/libRootAuth.so
 lib/root/libRootAuth.so.%%SHLIB_SHVER%%
 lib/root/libRootAuth.so.%%SHLIB_VER%%
+lib/root/libRootAuth_rdict.pcm
+lib/root/libSPlot.rootmap
 lib/root/libSPlot.so
 lib/root/libSPlot.so.%%SHLIB_SHVER%%
 lib/root/libSPlot.so.%%SHLIB_VER%%
+lib/root/libSPlot_rdict.pcm
+lib/root/libSQLIO.rootmap
 lib/root/libSQLIO.so
 lib/root/libSQLIO.so.%%SHLIB_SHVER%%
 lib/root/libSQLIO.so.%%SHLIB_VER%%
+lib/root/libSQLIO_rdict.pcm
+lib/root/libSmatrix.rootmap
 lib/root/libSmatrix.so
 lib/root/libSmatrix.so.%%SHLIB_SHVER%%
 lib/root/libSmatrix.so.%%SHLIB_VER%%
+lib/root/libSmatrix_G__Smatrix32_rdict.pcm
+lib/root/libSmatrix_rdict.pcm
 lib/root/libSmatrix32.rootmap
+%%SPECTRUM%%lib/root/libSpectrum.rootmap
 %%SPECTRUM%%lib/root/libSpectrum.so
 %%SPECTRUM%%lib/root/libSpectrum.so.%%SHLIB_SHVER%%
 %%SPECTRUM%%lib/root/libSpectrum.so.%%SHLIB_VER%%
+%%SPECTRUM%%lib/root/libSpectrumPainter.rootmap
 %%SPECTRUM%%lib/root/libSpectrumPainter.so
 %%SPECTRUM%%lib/root/libSpectrumPainter.so.%%SHLIB_SHVER%%
 %%SPECTRUM%%lib/root/libSpectrumPainter.so.%%SHLIB_VER%%
+%%SPECTRUM%%lib/root/libSpectrumPainter_rdict.pcm
+%%SPECTRUM%%lib/root/libSpectrum_rdict.pcm
 %%SSL%%lib/root/libSrvAuth.so
 %%SSL%%lib/root/libSrvAuth.so.%%SHLIB_SHVER%%
 %%SSL%%lib/root/libSrvAuth.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libTMVA.rootmap
 %%TMVAML%%lib/root/libTMVA.so
 %%TMVAML%%lib/root/libTMVA.so.%%SHLIB_SHVER%%
 %%TMVAML%%lib/root/libTMVA.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libTMVAGui.rootmap
 %%TMVAML%%lib/root/libTMVAGui.so
 %%TMVAML%%lib/root/libTMVAGui.so.%%SHLIB_SHVER%%
 %%TMVAML%%lib/root/libTMVAGui.so.%%SHLIB_VER%%
+%%TMVAML%%lib/root/libTMVAGui_rdict.pcm
+%%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils.rootmap
 %%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils.so
 %%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils.so.%%SHLIB_SHVER%%
 %%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils.so.%%SHLIB_VER%%
+%%TMVAML%%%%DATAFRAME%%lib/root/libTMVAUtils_rdict.pcm
+%%TMVAML%%lib/root/libTMVA_rdict.pcm
+lib/root/libThread.rootmap
 lib/root/libThread.so
 lib/root/libThread.so.%%SHLIB_SHVER%%
*** 49 LINES SKIPPED ***