[arch-commits] Commit in root/trunk (6 files)

Konstantin Gizdov kgizdov at archlinux.org
Tue Mar 3 17:15:11 UTC 2020


    Date: Tuesday, March 3, 2020 @ 17:15:10
  Author: kgizdov
Revision: 589787

upgpkg: root 6.20.00-1

Added:
  root/trunk/ROOFIT_LICENSE
  root/trunk/fix_relative_paths.patch
Modified:
  root/trunk/PKGBUILD
  root/trunk/root.pc.tpl
  root/trunk/settings-cuda.cmake
  root/trunk/settings.cmake

--------------------------+
 PKGBUILD                 |   82 ++++++++++++++++++---------------------------
 ROOFIT_LICENSE           |   22 ++++++++++++
 fix_relative_paths.patch |   61 +++++++++++++++++++++++++++++++++
 root.pc.tpl              |    5 +-
 settings-cuda.cmake      |   19 ++++------
 settings.cmake           |   19 ++++------
 6 files changed, 137 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 17:13:43 UTC (rev 589786)
+++ PKGBUILD	2020-03-03 17:15:10 UTC (rev 589787)
@@ -6,50 +6,33 @@
 
 pkgbase=root
 pkgname=('root' 'root-cuda')
-pkgver=6.18.04
-pkgrel=9
+pkgver=6.20.00
+pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
-url='https://root.cern.ch'
-license=('LGPL2.1')
+url='https://root.cern'
+license=('LGPL2.1' 'GPL' 'custom:University of California and Stanford University License')
 makedepends=('ccache'
              'cern-vdt'
              'cfitsio'
              'cmake'
              'cuda'
-             'fcgi'
-             'fftw'
-             'ftgl'
-             'blas'
+             'cudnn'
              'gcc-fortran'
-             'gcc8'
              'gcc8-fortran'
-             'giflib'
              'git'
-             'gl2ps'
-             'glew'
              'go-pie'
-             'gsl'
-             'hicolor-icon-theme'
-             'intel-tbb'
-             'libafterimage'
+             'libxml2'
              'libmariadbclient'
-             'librsvg'
-             'libxpm'
              'ocaml'
              'ocaml-ctypes'
              'openssl'
              'postgresql-libs'
              'pythia8>=8.2.40-1'
-             'python'
-             'python-numpy'
              'sqlite'
-             'tex-gyre-fonts'
              'unuran'
              'vc'
-             'xmlrpc-c'
              'xrootd>=4.6.0-2'
-             'xxhash>=0.6.5-1'
              'z3')
 depends=('blas'
          'desktop-file-utils'
@@ -66,12 +49,16 @@
          'libafterimage'
          'librsvg'
          'libxpm'
+         'python'
+         'python-numpy'
          'tex-gyre-fonts'
          'unixodbc'
-         'xxhash>=0.6.5-1')
-optdepends=('cfitsio: Read images and data from FITS files'
-            'cern-vdt: Add a set of fast and vectorisable mathematical functions'
+         'xxhash>=0.6.5-1'
+         'zstd')
+optdepends=('cern-vdt: Add a set of fast and vectorisable mathematical functions'
+            'cfitsio: Read images and data from FITS files'
             'libmariadbclient: MySQL support'
+            'libxml2: XML parser interface'
             'openssl: OpenSSL support'
             'postgresql-libs: PostgreSQL support'
             'pythia8>=8.2.40-1: Pythia8 EG support'
@@ -79,20 +66,24 @@
             'tcsh: Legacy CSH support'
             'unuran: Support non-uniform random numbers'
             'vc: Add types for portable and intuitive SIMD programming'
-            'libxml2: XML parser interface'
-            'xrootd: Support remote file server and client')
+            'xrootd: Support remote file server and client'
+            'z3: Suuport the Z3 theorem prover')
 source=("https://root.cern.ch/download/root_v${pkgver}.source.tar.gz"
+        'ROOFIT_LICENSE'
         'root.xml'
         'root.pc.tpl'
         'settings.cmake'
         'settings-cuda.cmake'
-        'add_missing_include_ROOT-10315.patch')
-sha256sums=('315a85fc8363f8eb1bffa0decbf126121258f79bd273513ed64795675485cfa4'
+        'add_missing_include_ROOT-10315.patch'
+        'fix_relative_paths.patch')
+sha256sums=('68421eb0434b38b66346fa8ea6053a0fdc9a6d254e4a72019f4e3633ae118bf0'
+            '43fb857c82c23016dc9ae82a591503c47d12ecbc576cb8285aa632b3e83b9839'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
-            'a0fc0c9404905f61fe8ba94e52ffbbefcdbcb198f2a577703b1924364a251395'
-            'e24884e67ad241e4893c8ecac973cd38f1ea523a54e774cc996989d40091cce3'
-            'a676e65d2615a5bb89943f72adc6e1552df60e9b0dc040c7bb05f6d640d9dbd6'
-            '1cb2654f22b5f1de7f8621434c76266968db77a1f300de857e47d0f4ad5da217')
+            '558b1c882ce166ad27349460f4da2a81a9a429ad0b5e802601b6ee2714610b0e'
+            '9d8280ae1e850dcb2d49bb917412d0056871cee99cd631168e264d9a85a97b4e'
+            '4e5546039dbf7bb90c6c1ae49f20f6025cde87573457bfec3266602d4fa06818'
+            '1cb2654f22b5f1de7f8621434c76266968db77a1f300de857e47d0f4ad5da217'
+            '06a4830be8ea98f47dcee1b1630dab91573fc0fa12d8c340c881a65e1a393b31')
 
 get_pyver () {
     python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
@@ -129,7 +120,6 @@
         -DINSTALL_PREFIX=/usr \
         "${srcdir}/${pkgbase}-${pkgver}"
 
-    cd "${srcdir}/build"
     make
 
     ## ROOT with CUDA
@@ -147,7 +137,6 @@
         -DINSTALL_PREFIX=/usr \
         "${srcdir}/${pkgbase}-${pkgver}-cuda"
 
-    cd "${srcdir}/build-cuda"
     make
 }
 
@@ -190,7 +179,7 @@
     echo '/usr/lib/root' > "${pkgdir}/etc/ld.so.conf.d/root.conf"
 
     # create pkg-config file
-    local _prefix _exec_prefix _bindir _libdir _incdir _pkg_ver _libs _cflags
+    local _prefix _exec_prefix _bindir _libdir _incdir _pkg_ver _libs _cflags _requires
     _prefix="$("${pkgdir}"/usr/bin/root-config --prefix)"
     _exec_prefix="$("${pkgdir}"/usr/bin/root-config --exec-prefix)"
     _bindir="$("${pkgdir}"/usr/bin/root-config --bindir)"
@@ -199,24 +188,19 @@
     _pkg_ver="$(sed -n 's,.*ROOT_RELEASE *\"\(.*\)\".*,\1,p' < "${pkgdir}"/usr/include/RVersion.h)"
     _libs="$("${pkgdir}"/usr/bin/root-config --libs)"
     _cflags="$("${pkgdir}"/usr/bin/root-config --cflags)"
+    printf -v _requires '%s,' "${depends[@]}"
     cp "${srcdir}/root.pc.tpl" "${bld_dir}"/
     sed -e "s at _PREFIX@${_prefix}@" -e "s at _EXECPREFIX@${_exec_prefix}@" \
         -e "s at _LIBDIR@${_libdir}@" -e "s at _INCDIR@${_incdir}@" \
         -e "s at _PKGVERSION@${_pkg_ver}@" -e "s at _LIBRARIES@${_libs}@" \
-        -e "s at _CFLAGS@${_cflags}@" \
+        -e "s at _CFLAGS@${_cflags}@" -e "s at _UPSTREAM_URL@${url}@" \
+        -e "s at _REQUIRES@${_requires}@" \
         -i "${bld_dir}/root.pc.tpl"
     install -Dm644 "${bld_dir}/root.pc.tpl" "${pkgdir}/usr/lib/pkgconfig/root.pc"
 
-    # put CMake config in correct path and fix relative paths
-    install -d "${pkgdir}/usr/lib/cmake/ROOT"
-    mv "${pkgdir}/usr/share/root/cmake"/* "${pkgdir}/usr/lib/cmake/ROOT"/
-    rm -rf "${pkgdir}/usr/share/root/cmake"
-    sed -e "s at ROOT_INCLUDE_DIRS .*include\"@ROOT_INCLUDE_DIRS \"${_incdir}\"@" \
-        -e "s at ROOT_LIBRARY_DIR .*lib/root\"@ROOT_LIBRARY_DIR \"${_libdir}\"@" \
-        -e "s at ROOT_BINARY_DIR .*bin\"@ROOT_BINARY_DIR \"${_bindir}\"@" \
-        -e 's@# ROOT configured for the install with relative paths, so use these@# ROOT was patched to use correct absolute paths, specifically these at g' \
-        -i "${pkgdir}"/usr/lib/cmake/ROOT/ROOTConfig.cmake
-    ln -sf "/usr/lib/root/cmake/cling" "${pkgdir}/usr/lib/cmake/ROOT/cling"
+    # install all licenses
+    install -d "${pkgdir}/usr/share/licenses/roofit"
+    install "${srcdir}/ROOFIT_LICENSE" "${pkgdir}/usr/share/licenses/roofit/LICENSE"
 }
 
 package_root() {
@@ -228,7 +212,7 @@
     pkgdesc='C++ data analysis framework and interpreter from CERN with GPU (CUDA) features enabled'
     provides=('root')
     conflicts=('root')
-    depends+=('cuda')
+    depends+=('cuda' 'cudnn')
     optdepends+=('gcc8-fortran: Enable the Fortran components of ROOT')
     _package build-cuda
 }

Added: ROOFIT_LICENSE
===================================================================
--- ROOFIT_LICENSE	                        (rev 0)
+++ ROOFIT_LICENSE	2020-03-03 17:15:10 UTC (rev 589787)
@@ -0,0 +1,22 @@
+RooFit --- Copyright (c) 2000-2005, Regents of the University of California and Stanford University
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+  - Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: fix_relative_paths.patch
===================================================================
--- fix_relative_paths.patch	                        (rev 0)
+++ fix_relative_paths.patch	2020-03-03 17:15:10 UTC (rev 589787)
@@ -0,0 +1,61 @@
+diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
+index 41a9cffc78..be963296d2 100644
+--- a/cmake/modules/RootConfiguration.cmake
++++ b/cmake/modules/RootConfiguration.cmake
+@@ -678,22 +678,36 @@ file(RELATIVE_PATH ROOT_CMAKE_TO_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "$
+ file(RELATIVE_PATH ROOT_CMAKE_TO_LIB_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}")
+ file(RELATIVE_PATH ROOT_CMAKE_TO_BIN_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_BINDIR}")
+ 
++# '_' prefixed variables are used to construct the paths,
++# while the normal variants evaluate to full paths at runtime
++set(_ROOT_INCLUDE_DIR_SETUP "
++# ROOT configured for the install with relative paths, so use these
++get_filename_component(_ROOT_INCLUDE_DIRS \"\${_thisdir}/${ROOT_CMAKE_TO_INCLUDE_DIR}\" REALPATH)
++")
+ set(ROOT_INCLUDE_DIR_SETUP "
+ # ROOT configured for the install with relative paths, so use these
+-get_filename_component(ROOT_INCLUDE_DIRS \"\${_thisdir}/${ROOT_CMAKE_TO_INCLUDE_DIR}\" ABSOLUTE)
++get_filename_component(ROOT_INCLUDE_DIRS \"\${_ROOT_INCLUDE_DIRS}\" REALPATH)
++")
++set(_ROOT_LIBRARY_DIR_SETUP "
++# ROOT configured for the install with relative paths, so use these
++get_filename_component(_ROOT_LIBRARY_DIR \"\${_thisdir}/${ROOT_CMAKE_TO_LIB_DIR}\" REALPATH)
+ ")
+ set(ROOT_LIBRARY_DIR_SETUP "
+ # ROOT configured for the install with relative paths, so use these
+-get_filename_component(ROOT_LIBRARY_DIR \"\${_thisdir}/${ROOT_CMAKE_TO_LIB_DIR}\" ABSOLUTE)
++get_filename_component(ROOT_LIBRARY_DIR \"\${_ROOT_LIBRARY_DIR}\" REALPATH)
++")
++set(_ROOT_BINDIR_SETUP "
++# ROOT configured for the install with relative paths, so use these
++get_filename_component(_ROOT_BINDIR \"\${_thisdir}/${ROOT_CMAKE_TO_BIN_DIR}\" REALPATH)
+ ")
+ set(ROOT_BINDIR_SETUP "
+ # ROOT configured for the install with relative paths, so use these
+-get_filename_component(ROOT_BINDIR \"\${_thisdir}/${ROOT_CMAKE_TO_BIN_DIR}\" ABSOLUTE)
++get_filename_component(ROOT_BINDIR \"\${_ROOT_BINDIR}\" REALPATH)
+ ")
+ # Deprecated value ROOT_BINARY_DIR
+ set(ROOT_BINARY_DIR_SETUP "
+ # Deprecated value, please don't use it and use ROOT_BINDIR instead.
+-get_filename_component(ROOT_BINARY_DIR \"\${ROOT_BINDIR}\" ABSOLUTE)
++get_filename_component(ROOT_BINARY_DIR \"\${ROOT_BINDIR}\" REALPATH)
+ ")
+ 
+ # used by ROOTConfig.cmake from the build directory
+diff --git a/cmake/scripts/ROOTConfig.cmake.in b/cmake/scripts/ROOTConfig.cmake.in
+index c0c31484b6..7faab0ef2b 100644
+--- a/cmake/scripts/ROOTConfig.cmake.in
++++ b/cmake/scripts/ROOTConfig.cmake.in
+@@ -57,8 +57,11 @@ get_filename_component(_thisdir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+ # Configure the path to the ROOT headers, using a relative path if possible.
+ # This is only known at CMake time, so we expand a CMake supplied variable.
+ #
++ at _ROOT_INCLUDE_DIR_SETUP@
+ @ROOT_INCLUDE_DIR_SETUP@
++ at _ROOT_LIBRARY_DIR_SETUP@
+ @ROOT_LIBRARY_DIR_SETUP@
++ at _ROOT_BINDIR_SETUP@
+ @ROOT_BINDIR_SETUP@
+ @ROOT_BINARY_DIR_SETUP@
+ 

Modified: root.pc.tpl
===================================================================
--- root.pc.tpl	2020-03-03 17:13:43 UTC (rev 589786)
+++ root.pc.tpl	2020-03-03 17:15:10 UTC (rev 589787)
@@ -4,8 +4,9 @@
 includedir=_INCDIR
 
 Name: ROOT
+Description: C++ data analysis framework and interpreter from CERN
 Version: _PKGVERSION
-Description: C++ data analysis framework and interpreter from CERN
-Requires:
+URL: _UPSTREAM_URL
+Requires: _REQUIRES
 Libs: _LIBRARIES
 Cflags: _CFLAGS

Modified: settings-cuda.cmake
===================================================================
--- settings-cuda.cmake	2020-03-03 17:13:43 UTC (rev 589786)
+++ settings-cuda.cmake	2020-03-03 17:15:10 UTC (rev 589787)
@@ -1,9 +1,10 @@
 set (CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE)
-set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)  # this option is currently incompatible
+set (BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
 set (CMAKE_INSTALL_PREFIX /usr CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_BINDIR bin CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_LIBDIR lib/root CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_CMAKEDIR /usr/lib/cmake/ROOT CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_BINDIR /usr/bin CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_LIBDIR /usr/lib/root CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_INCLUDEDIR /usr/include CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_SYSCONFDIR /etc/root CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_DATAROOTDIR /usr/share CACHE PATH "" FORCE)
 set (CMAKE_CXX_STANDARD 14 CACHE STRING "" FORCE)
@@ -10,7 +11,6 @@
 set (alien OFF CACHE BOOL "" FORCE)
 set (all OFF CACHE BOOL "" FORCE)
 set (asimage ON CACHE BOOL "" FORCE)
-set (astiff ON CACHE BOOL "" FORCE)
 set (builtin_afterimage OFF CACHE BOOL "" FORCE)
 set (builtin_clang ON CACHE BOOL "" FORCE)
 set (CLANG_ENABLE_STATIC_ANALYZER ON CACHE BOOL "" FORCE)
@@ -33,15 +33,13 @@
 set (builtin_xxhash OFF CACHE BOOL "" FORCE)
 set (builtin_xrootd OFF CACHE BOOL "" FORCE)
 set (builtin_zlib OFF CACHE BOOL "" FORCE)
-set (ccache OFF CACHE BOOL "" FORCE)
+set (ccache ON CACHE BOOL "" FORCE)
 set (clad ON CACHE BOOL "" FORCE)
-set (cling ON CACHE BOOL "" FORCE)
 set (cocoa OFF CACHE BOOL "" FORCE)  # MacOS only
 set (cuda ON CACHE BOOL "" FORCE)
 set (davix OFF CACHE BOOL "" FORCE)
 set (dcache OFF CACHE BOOL "" FORCE)
 set (exceptions ON CACHE BOOL "" FORCE)
-set (explicitlink ON CACHE BOOL "" FORCE)
 set (fail-on-missing ON CACHE BOOL "" FORCE)
 set (fftw3 ON CACHE BOOL "" FORCE)
 set (fitsio ON CACHE BOOL "" FORCE)
@@ -60,7 +58,9 @@
 set (mathmore ON CACHE BOOL "" FORCE)
 set (minimal OFF CACHE BOOL "" FORCE)
 set (minuit2 ON CACHE BOOL "" FORCE)
+set (mlp ON CACHE BOOL "" FORCE)
 set (monalisa OFF CACHE BOOL "" FORCE)
+set (mpi ON CACHE BOOL "" FORCE)
 set (mt ON CACHE BOOL "" FORCE)
 set (mysql ON CACHE BOOL "" FORCE)
 set (odbc ON CACHE BOOL "" FORCE)
@@ -67,7 +67,6 @@
 set (opengl ON CACHE BOOL "" FORCE)
 set (OpenGL_GL_PREFERENCE GLVND CACHE STRING "" FORCE)  # use new policy since 3.11
 set (oracle OFF CACHE BOOL "" FORCE)
-set (pch ON CACHE BOOL "" FORCE)
 set (pgsql ON CACHE BOOL "" FORCE)
 set (pythia6 OFF CACHE BOOL "" FORCE)
 set (pythia6_nolink OFF CACHE BOOL "" FORCE)
@@ -83,12 +82,12 @@
 set (shadowpw ON CACHE BOOL "" FORCE)
 set (shared ON CACHE BOOL "" FORCE)
 set (soversion OFF CACHE BOOL "" FORCE)
+set (spectrum ON CACHE BOOL "" FORCE)
 set (sqlite ON CACHE BOOL "" FORCE)
 set (ssl ON CACHE BOOL "" FORCE)
 set (tbb ON CACHE BOOL "" FORCE)
 set (tcmalloc OFF CACHE BOOL "" FORCE)
 set (testing OFF CACHE BOOL "" FORCE)
-set (thread ON CACHE BOOL "" FORCE)  # cannot be disabled
 set (tmva ON CACHE BOOL "" FORCE)
 set (tmva-cpu OFF CACHE BOOL "" FORCE)
 set (tmva-gpu ON CACHE BOOL "" FORCE)

Modified: settings.cmake
===================================================================
--- settings.cmake	2020-03-03 17:13:43 UTC (rev 589786)
+++ settings.cmake	2020-03-03 17:15:10 UTC (rev 589787)
@@ -1,9 +1,10 @@
 set (CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE)
-set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)  # this option is currently incompatible
+set (BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
 set (CMAKE_INSTALL_PREFIX /usr CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_BINDIR bin CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_LIBDIR lib/root CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_CMAKEDIR /usr/lib/cmake/ROOT CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_BINDIR /usr/bin CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_LIBDIR /usr/lib/root CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_INCLUDEDIR /usr/include CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_SYSCONFDIR /etc/root CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_DATAROOTDIR /usr/share CACHE PATH "" FORCE)
 set (CMAKE_CXX_STANDARD 17 CACHE STRING "" FORCE)
@@ -10,7 +11,6 @@
 set (alien OFF CACHE BOOL "" FORCE)
 set (all OFF CACHE BOOL "" FORCE)
 set (asimage ON CACHE BOOL "" FORCE)
-set (astiff ON CACHE BOOL "" FORCE)
 set (builtin_afterimage OFF CACHE BOOL "" FORCE)
 set (builtin_clang ON CACHE BOOL "" FORCE)
 set (CLANG_ENABLE_STATIC_ANALYZER ON CACHE BOOL "" FORCE)
@@ -33,15 +33,13 @@
 set (builtin_xxhash OFF CACHE BOOL "" FORCE)
 set (builtin_xrootd OFF CACHE BOOL "" FORCE)
 set (builtin_zlib OFF CACHE BOOL "" FORCE)
-set (ccache OFF CACHE BOOL "" FORCE)
+set (ccache ON CACHE BOOL "" FORCE)
 set (clad ON CACHE BOOL "" FORCE)
-set (cling ON CACHE BOOL "" FORCE)
 set (cocoa OFF CACHE BOOL "" FORCE)  # MacOS only
 set (cuda OFF CACHE BOOL "" FORCE)
 set (davix OFF CACHE BOOL "" FORCE)
 set (dcache OFF CACHE BOOL "" FORCE)
 set (exceptions ON CACHE BOOL "" FORCE)
-set (explicitlink ON CACHE BOOL "" FORCE)
 set (fail-on-missing ON CACHE BOOL "" FORCE)
 set (fftw3 ON CACHE BOOL "" FORCE)
 set (fitsio ON CACHE BOOL "" FORCE)
@@ -60,7 +58,9 @@
 set (mathmore ON CACHE BOOL "" FORCE)
 set (minimal OFF CACHE BOOL "" FORCE)
 set (minuit2 ON CACHE BOOL "" FORCE)
+set (mlp ON CACHE BOOL "" FORCE)
 set (monalisa OFF CACHE BOOL "" FORCE)
+set (mpi ON CACHE BOOL "" FORCE)
 set (mt ON CACHE BOOL "" FORCE)
 set (mysql ON CACHE BOOL "" FORCE)
 set (odbc ON CACHE BOOL "" FORCE)
@@ -67,7 +67,6 @@
 set (opengl ON CACHE BOOL "" FORCE)
 set (OpenGL_GL_PREFERENCE GLVND CACHE STRING "" FORCE)  # use new policy since 3.11
 set (oracle OFF CACHE BOOL "" FORCE)
-set (pch ON CACHE BOOL "" FORCE)
 set (pgsql ON CACHE BOOL "" FORCE)
 set (pythia6 OFF CACHE BOOL "" FORCE)
 set (pythia6_nolink OFF CACHE BOOL "" FORCE)
@@ -83,12 +82,12 @@
 set (shadowpw ON CACHE BOOL "" FORCE)
 set (shared ON CACHE BOOL "" FORCE)
 set (soversion OFF CACHE BOOL "" FORCE)
+set (spectrum ON CACHE BOOL "" FORCE)
 set (sqlite ON CACHE BOOL "" FORCE)
 set (ssl ON CACHE BOOL "" FORCE)
 set (tbb ON CACHE BOOL "" FORCE)
 set (tcmalloc OFF CACHE BOOL "" FORCE)
 set (testing OFF CACHE BOOL "" FORCE)
-set (thread ON CACHE BOOL "" FORCE)  # cannot be disabled
 set (tmva ON CACHE BOOL "" FORCE)
 set (tmva-cpu ON CACHE BOOL "" FORCE)
 set (tmva-pymva ON CACHE BOOL "" FORCE)



More information about the arch-commits mailing list