[arch-commits] Commit in root/trunk (PKGBUILD settings-cuda.cmake settings.cmake)

Konstantin Gizdov kgizdov at archlinux.org
Fri Jun 12 08:37:16 UTC 2020


    Date: Friday, June 12, 2020 @ 08:37:16
  Author: kgizdov
Revision: 642382

add fcgi, qt5 webgui, minuit mpi and openmp and fix some opts

Modified:
  root/trunk/PKGBUILD
  root/trunk/settings-cuda.cmake
  root/trunk/settings.cmake

---------------------+
 PKGBUILD            |  156 +++++++++++++++++++++++++++-----------------------
 settings-cuda.cmake |    9 ++
 settings.cmake      |   10 +++
 3 files changed, 105 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-12 08:01:55 UTC (rev 642381)
+++ PKGBUILD	2020-06-12 08:37:16 UTC (rev 642382)
@@ -7,84 +7,100 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.20.04
-pkgrel=8
+pkgrel=9
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
 license=('LGPL2.1' 'GPL' 'custom:University of California and Stanford University License')
-makedepends=('ccache'
-             'cern-vdt'
-             'cfitsio'
-             'cmake'
-             'cuda'
-             'cudnn'
-             'gcc-fortran'
-             'gcc8-fortran'
-             'git'
-             'go'
-             'libxml2'
-             'libmariadbclient'
-             'ocaml'
-             'ocaml-ctypes'
-             'openssl'
-             'postgresql-libs'
-             'pythia8>=8.2.40-1'
-             'sqlite'
-             'unuran'
-             'vc'
-             'xrootd>=4.6.0-2'
-             'z3')
-depends=('blas'
-         'desktop-file-utils'
-         'fcgi'
-         'fftw'
-         'ftgl'
-         'giflib'
-         'gl2ps'
-         'glew'
-         'graphviz'
-         'gsl'
-         'hicolor-icon-theme'
-         'intel-tbb'
-         'libafterimage'
-         'librsvg'
-         'libxpm'
-         'python'
-         'python-numpy'
-         'tex-gyre-fonts'
-         'unixodbc'
-         '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'
-            'sqlite: SQLite support'
-            'tcsh: Legacy CSH support'
-            'unuran: Support non-uniform random numbers'
-            'vc: Add types for portable and intuitive SIMD programming'
-            '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'
-        'jupyter_notebook_config.py'
-        'add_missing_include_ROOT-10315.patch'
-        'fix_relative_paths.patch'
-        'nbman-for-arch.patch'
-        'thisroot.fail')
+makedepends=(
+    'ccache'
+    'cern-vdt'
+    'chromium'
+    'cfitsio'
+    'cmake'
+    'cuda'
+    'cudnn'
+    'gcc-fortran'
+    'gcc8-fortran'
+    'git'
+    'go'
+    'libxml2'
+    'libmariadbclient'
+    'ocaml'
+    'ocaml-ctypes'
+    'openmp'
+    'openmpi'
+    'openssl'
+    'postgresql-libs'
+    'pythia8>=8.2.40-1'
+    'qt5-webengine'
+    'sqlite'
+    'unuran'
+    'vc'
+    'xrootd>=4.6.0-2'
+    'z3'
+)
+depends=(
+    'blas'
+    'desktop-file-utils'
+    'fcgi'
+    'fftw'
+    'ftgl'
+    'giflib'
+    'gl2ps'
+    'glew'
+    'graphviz'
+    'gsl'
+    'hicolor-icon-theme'
+    'intel-tbb'
+    'libafterimage'
+    'librsvg'
+    'libxpm'
+    'python'
+    'python-numpy'
+    'tex-gyre-fonts'
+    'unixodbc'
+    'xxhash>=0.6.5-1'
+    'zstd'
+)
+optdepends=(
+    'cern-vdt: Add a set of fast and vectorisable mathematical functions'
+    'chromium: Support for WebGUI'
+    'cfitsio: Read images and data from FITS files'
+    'libmariadbclient: MySQL support'
+    'libxml2: XML parser interface'
+    'openmp: Support OpenMP extensions in Minuit2'
+    'openmpi: Support OpenMPI extensions in Minuit2'
+    'openssl: OpenSSL support'
+    'postgresql-libs: PostgreSQL support'
+    'pythia8>=8.2.40-1: Pythia8 EG support'
+    'qt5-webengine: Support for WebGUI'
+    'sqlite: SQLite support'
+    'tcsh: Legacy CSH support'
+    'unuran: Support non-uniform random numbers'
+    'vc: Add types for portable and intuitive SIMD programming'
+    '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'
+    'jupyter_notebook_config.py'
+    'add_missing_include_ROOT-10315.patch'
+    'fix_relative_paths.patch'
+    'nbman-for-arch.patch'
+    'thisroot.fail'
+)
 sha512sums=('3cc214a4b160795c8aa53b6fdb01370c3aea628696d1668cbf47e6beac56f171674619a853a1219336d9b67ad06db1d9ecd13345bf1731f809da9e60b3d39a2c'
             'af8f178fc9df66997d5495b271e38adcd1636aab4c8fc994c6600c2496127829d831250d73d3fc229b02dfe49b9867d0be979beacb959f2f3a05351b8118a4a6'
             '1fe6f4aa09d583d33f27cc766f4935510bb7ab6bbb8d4700baa1aaab92ea6c876500b67da1e4f6e0b510aa5616e4e193b860264b86925de85f2d9f558d75d5dc'
             '3c81d255a17b902ffac0187af1752847036137e16641a88b17eef0d9c944e6f0d3c954bc93307d6270603f43f6c23f2e04f98dc7a68f9d076dbaa8006a2527d6'
-            'cfdb28b90d2f6379709baea82afb14b8a60f749b6c5a50e1dea4ee203d799f9bd0b1e207251d82f4b90010824212515f2deac579a93aff847b072210f828e58b'
-            '7132f8801e4fc7ac8706a0180720a0076e58d0a96359bde25263055187b1c50e9ec6a11de88f775966cc515cb52cbefe5f56d9b6140e388b81601169fff1f38c'
+            'e42665d2e9fff65b86f43f6cf9adfc882facf956ab061f3c96a58b51cc8bdf88cdc16725038ea79814afd60a5cdeb3dee62c05b822f7b3aea887bad9b77d6fb3'
+            'ccdeab5fcb7ebd5ff0a32b5ffa8b3751020b21d35a275e3d11b553a1daf30da100446d527d47ed4ef2a07cb61ee2d973cd91e32f49369cb0a2614bc9f80d3f81'
             '1c905ee7a3f8f5f3f567d957f9be6b503a8631565d4d9b9bfea5e496ef86865c5a8be1a1f8c7842754029879cf0afd2465249f532a116cc43660aa2e460ae682'
             '19b46d3b6a8083d9461f5d4f57845a1145b80de699e8b773cee7edecad0b064fe570faffa226720078273f40a88fe8ba933b7d944925391ad869f0b9cdbf9579'
             'fa2f3b9b8717bfd11b6743a4457bbff104e547112bcec864f212510b1954a92809d9bde5ada8702d11659a150f2957daed4e4d2621858b0bc4e234d9f6924244'

Modified: settings-cuda.cmake
===================================================================
--- settings-cuda.cmake	2020-06-12 08:01:55 UTC (rev 642381)
+++ settings-cuda.cmake	2020-06-12 08:37:16 UTC (rev 642382)
@@ -8,6 +8,8 @@
 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)
+set (PYTHIA8_DATA /usr/share/pythia8/xmldoc CACHE PATH "" FORCE)  # sync with pythia8 package
+set (GLEW_DIR /usr/include/GL CACHE PATH "" FORCE)  # need to set manually
 set (alien OFF CACHE BOOL "" FORCE)
 set (all OFF CACHE BOOL "" FORCE)
 set (asimage ON CACHE BOOL "" FORCE)
@@ -37,10 +39,13 @@
 set (clad ON CACHE BOOL "" FORCE)
 set (cocoa OFF CACHE BOOL "" FORCE)  # MacOS only
 set (cuda ON CACHE BOOL "" FORCE)
+set (cudnn ON CACHE BOOL "" FORCE)
+set (dataframe ON CACHE BOOL "" FORCE)
 set (davix OFF CACHE BOOL "" FORCE)
 set (dcache OFF CACHE BOOL "" FORCE)
 set (exceptions ON CACHE BOOL "" FORCE)
 set (fail-on-missing ON CACHE BOOL "" FORCE)
+set (fcgi ON CACHE BOOL "" FORCE)
 set (fftw3 ON CACHE BOOL "" FORCE)
 set (fitsio ON CACHE BOOL "" FORCE)
 set (fortran ON CACHE BOOL "" FORCE)
@@ -58,6 +63,8 @@
 set (mathmore ON CACHE BOOL "" FORCE)
 set (minimal OFF CACHE BOOL "" FORCE)
 set (minuit2 ON CACHE BOOL "" FORCE)
+set (minuit2_mpi ON CACHE BOOL "" FORCE)
+set (minuit2_omp ON CACHE BOOL "" FORCE)
 set (mlp ON CACHE BOOL "" FORCE)
 set (monalisa OFF CACHE BOOL "" FORCE)
 set (mpi ON CACHE BOOL "" FORCE)
@@ -72,6 +79,7 @@
 set (pythia6_nolink OFF CACHE BOOL "" FORCE)
 set (pythia8 ON CACHE BOOL "" FORCE)
 set (pyroot ON CACHE BOOL "" FORCE)
+set (qt5web ON CACHE BOOL "" FORCE)
 set (roofit ON CACHE BOOL "" FORCE)
 set (root7 ON CACHE BOOL "" FORCE)
 set (roottest OFF CACHE BOOL "" FORCE)
@@ -95,6 +103,7 @@
 set (vc ON CACHE BOOL "" FORCE)
 set (vdt ON CACHE BOOL "" FORCE)
 set (winrtdebug OFF CACHE BOOL "" FORCE)  # windows only
+set (webgui ON CACHE BOOL "" FORCE)
 set (x11 ON CACHE BOOL "" FORCE)
 set (xml ON CACHE BOOL "" FORCE)
 set (xrootd ON CACHE BOOL "" FORCE)

Modified: settings.cmake
===================================================================
--- settings.cmake	2020-06-12 08:01:55 UTC (rev 642381)
+++ settings.cmake	2020-06-12 08:37:16 UTC (rev 642382)
@@ -8,6 +8,8 @@
 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)
+set (PYTHIA8_DATA /usr/share/pythia8/xmldoc CACHE PATH "" FORCE)  # sync with pythia8 package
+set (GLEW_DIR /usr/include/GL CACHE PATH "" FORCE)  # need to set manually
 set (alien OFF CACHE BOOL "" FORCE)
 set (all OFF CACHE BOOL "" FORCE)
 set (asimage ON CACHE BOOL "" FORCE)
@@ -37,10 +39,13 @@
 set (clad ON CACHE BOOL "" FORCE)
 set (cocoa OFF CACHE BOOL "" FORCE)  # MacOS only
 set (cuda OFF CACHE BOOL "" FORCE)
+set (cudnn OFF CACHE BOOL "" FORCE)
+set (dataframe ON CACHE BOOL "" FORCE)
 set (davix OFF CACHE BOOL "" FORCE)
 set (dcache OFF CACHE BOOL "" FORCE)
 set (exceptions ON CACHE BOOL "" FORCE)
 set (fail-on-missing ON CACHE BOOL "" FORCE)
+set (fcgi ON CACHE BOOL "" FORCE)
 set (fftw3 ON CACHE BOOL "" FORCE)
 set (fitsio ON CACHE BOOL "" FORCE)
 set (fortran ON CACHE BOOL "" FORCE)
@@ -58,6 +63,8 @@
 set (mathmore ON CACHE BOOL "" FORCE)
 set (minimal OFF CACHE BOOL "" FORCE)
 set (minuit2 ON CACHE BOOL "" FORCE)
+set (minuit2_mpi ON CACHE BOOL "" FORCE)
+set (minuit2_omp ON CACHE BOOL "" FORCE)
 set (mlp ON CACHE BOOL "" FORCE)
 set (monalisa OFF CACHE BOOL "" FORCE)
 set (mpi ON CACHE BOOL "" FORCE)
@@ -72,6 +79,7 @@
 set (pythia6_nolink OFF CACHE BOOL "" FORCE)
 set (pythia8 ON CACHE BOOL "" FORCE)
 set (pyroot ON CACHE BOOL "" FORCE)
+set (qt5web ON CACHE BOOL "" FORCE)
 set (roofit ON CACHE BOOL "" FORCE)
 set (root7 ON CACHE BOOL "" FORCE)
 set (roottest OFF CACHE BOOL "" FORCE)
@@ -89,11 +97,13 @@
 set (testing OFF CACHE BOOL "" FORCE)
 set (tmva ON CACHE BOOL "" FORCE)
 set (tmva-cpu ON CACHE BOOL "" FORCE)
+set (tmva-gpu OFF CACHE BOOL "" FORCE)
 set (tmva-pymva ON CACHE BOOL "" FORCE)
 set (unuran ON CACHE BOOL "" FORCE)
 set (vc ON CACHE BOOL "" FORCE)
 set (vdt ON CACHE BOOL "" FORCE)
 set (winrtdebug OFF CACHE BOOL "" FORCE)  # windows only
+set (webgui ON CACHE BOOL "" FORCE)
 set (x11 ON CACHE BOOL "" FORCE)
 set (xml ON CACHE BOOL "" FORCE)
 set (xrootd ON CACHE BOOL "" FORCE)



More information about the arch-commits mailing list