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

[Konstantin Gizdov]

    Date: Wednesday, September 30, 2020 @ 11:29:46
  Author: kgizdov
Revision: 714068

cuda 11 rebuild

Modified:
  root/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-30 10:19:01 UTC (rev 714067)
+++ PKGBUILD	2020-09-30 11:29:46 UTC (rev 714068)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.22.02
-pkgrel=2
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -21,7 +21,6 @@
     'cuda'
     'cudnn'
     'gcc-fortran'
-    'gcc9-fortran'
     'git'
     'go'
     'libxml2'
@@ -163,8 +162,6 @@
     mkdir -p "${srcdir}/build-cuda"
     cd "${srcdir}/build-cuda"
 
-    CC=/usr/bin/gcc-9 \
-    CXX=/usr/bin/g++-9 \
     cmake -C "${srcdir}/settings-cuda.cmake" \
         ${CUSTOM_CMAKE_FLAGS} \
         "${srcdir}/${pkgbase}-${pkgver}-cuda"
@@ -244,9 +241,9 @@
     install "${srcdir}/ROOFIT_LICENSE" "${pkgdir}/usr/share/licenses/roofit/LICENSE"
     install -d "${pkgdir}/usr/share/licenses/${pkgname}"
     ln -s '/usr/share/doc/root/LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    for fold in fonts js; do
-      install -d "${pkgdir}/usr/share/licenses/${pkgname}/${fold}"
-      ln -s "/usr/share/root/${fold}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/${fold}"/
+    for _fold in fonts js; do
+      install -d "${pkgdir}/usr/share/licenses/${pkgname}/${_fold}"
+      ln -s "/usr/share/root/${_fold}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/${_fold}"/
     done
     ln -s '/usr/share/licenses/roofit' "${pkgdir}/usr/share/licenses/${pkgname}/roofit"
     if [ "${pkgname}" != "root" ]; then
@@ -277,6 +274,6 @@
     provides=('root')
     conflicts=('root')
     depends+=('cuda' 'cudnn')
-    optdepends+=('gcc8-fortran: Enable the Fortran components of ROOT')
+    optdepends+=('gcc-fortran: Enable the Fortran components of ROOT')
     _package build-cuda
 }