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

[Konstantin Gizdov]

    Date: Thursday, March 19, 2020 @ 21:51:14
  Author: kgizdov
Revision: 601252

upgpkg: root 6.20.02-1

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

---------------------+
 PKGBUILD            |   53 +++++++++++++++++++++++++++++---------------------
 settings-cuda.cmake |    3 --
 settings.cmake      |    3 --
 3 files changed, 33 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-19 21:50:20 UTC (rev 601251)
+++ PKGBUILD	2020-03-19 21:51:14 UTC (rev 601252)
@@ -6,8 +6,8 @@
 
 pkgbase=root
 pkgname=('root' 'root-cuda')
-pkgver=6.20.00
-pkgrel=3
+pkgver=6.20.02
+pkgrel=1
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -21,7 +21,7 @@
              'gcc-fortran'
              'gcc8-fortran'
              'git'
-             'go-pie'
+             'go'
              'libxml2'
              'libmariadbclient'
              'ocaml'
@@ -76,12 +76,12 @@
         'settings-cuda.cmake'
         'add_missing_include_ROOT-10315.patch'
         'fix_relative_paths.patch')
-sha256sums=('68421eb0434b38b66346fa8ea6053a0fdc9a6d254e4a72019f4e3633ae118bf0'
+sha256sums=('0997586bf097c0afbc6f08edbffcebf5eb6a4237262216114ba3f5c8087dcba6'
             '43fb857c82c23016dc9ae82a591503c47d12ecbc576cb8285aa632b3e83b9839'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
             '558b1c882ce166ad27349460f4da2a81a9a429ad0b5e802601b6ee2714610b0e'
-            '9d8280ae1e850dcb2d49bb917412d0056871cee99cd631168e264d9a85a97b4e'
-            '4e5546039dbf7bb90c6c1ae49f20f6025cde87573457bfec3266602d4fa06818'
+            '54cae85b8ff132cd0de6654048797281a7725efaa8158a3b97ea21ce8f258ebd'
+            'b1cad3e74be54ea7ef65a522d726e608b7f5b451c036c4cbb7511f454f015f4c'
             '1cb2654f22b5f1de7f8621434c76266968db77a1f300de857e47d0f4ad5da217'
             'd5b135fb4d6329277e33d612f8b81b1ca60681cca96196e33ab776f3018a2fa8')
 
@@ -99,10 +99,31 @@
         patch -Np1 -i "../$src" -d "${srcdir}/${pkgbase}-${pkgver}"
     done
 
+    # specify some custom flags
+    # needed by vc to link properly
+    CUSTOM_CMAKE_FLAGS="-DTARGET_ARCHITECTURE:STRING=generic "
+    # make sure it finds python
+    CUSTOM_CMAKE_FLAGS+="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python "
+    # need to set install prefix like so
+    CUSTOM_CMAKE_FLAGS+="-DINSTALL_PREFIX=/usr "
     # don't let ROOT play around with lib paths
-    sed -i -e 's at SetLibraryPath();@@g' \
-        "${srcdir}/${pkgbase}-${pkgver}/rootx/src/rootx.cxx"
+    # the following is no longer necessary
+    # sed -i -e 's at SetLibraryPath();@@g' \
+    #     "${srcdir}/${pkgbase}-${pkgver}/rootx/src/rootx.cxx"
+    # now only depends on IS_RPATH_BUILD being set
+    # so pass it to GCC
+    CUSTOM_CMAKE_FLAGS+="-DIS_RPATH_BUILD=1 "
+    export CUSTOM_CMAKE_FLAGS
 
+    # update system flags
+    export CFLAGS="${CFLAGS} -pthread"
+    export CXXFLAGS="${CXXFLAGS} -pthread"
+    export LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined"
+
+    # go flags for built-in clang
+    export CGO_LDFLAGS="${LDFLAGS}"
+    export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
+
     cp -r "${pkgbase}-${pkgver}" "${pkgbase}-${pkgver}-cuda"
 }
 
@@ -111,15 +132,9 @@
     mkdir -p "${srcdir}/build"
     cd "${srcdir}/build"
 
-    CFLAGS="${CFLAGS} -pthread" \
-    CXXFLAGS="${CXXFLAGS} -pthread" \
-    LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
     cmake -C "${srcdir}/settings.cmake" \
-        -DTARGET_ARCHITECTURE:STRING=generic \
-        -DPYTHON_EXECUTABLE:PATH=/usr/bin/python \
-        -DINSTALL_PREFIX=/usr \
+        ${CUSTOM_CMAKE_FLAGS} \
         "${srcdir}/${pkgbase}-${pkgver}"
-
     make
 
     ## ROOT with CUDA
@@ -128,15 +143,9 @@
 
     CC=/usr/bin/gcc-8 \
     CXX=/usr/bin/g++-8 \
-    CFLAGS="${CFLAGS} -pthread" \
-    CXXFLAGS="${CXXFLAGS} -pthread" \
-    LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
     cmake -C "${srcdir}/settings-cuda.cmake" \
-        -DTARGET_ARCHITECTURE:STRING=generic \
-        -DPYTHON_EXECUTABLE:PATH=/usr/bin/python \
-        -DINSTALL_PREFIX=/usr \
+        ${CUSTOM_CMAKE_FLAGS} \
         "${srcdir}/${pkgbase}-${pkgver}-cuda"
-
     make
 }
 

Modified: settings-cuda.cmake
===================================================================
--- settings-cuda.cmake	2020-03-19 21:50:20 UTC (rev 601251)
+++ settings-cuda.cmake	2020-03-19 21:51:14 UTC (rev 601252)
@@ -71,8 +71,7 @@
 set (pythia6 OFF CACHE BOOL "" FORCE)
 set (pythia6_nolink OFF CACHE BOOL "" FORCE)
 set (pythia8 ON CACHE BOOL "" FORCE)
-# set (python3 ON CACHE BOOL "" FORCE)
-set (python ON CACHE BOOL "" FORCE)
+set (pyroot ON CACHE BOOL "" FORCE)
 set (roofit ON CACHE BOOL "" FORCE)
 set (root7 ON CACHE BOOL "" FORCE)
 set (roottest OFF CACHE BOOL "" FORCE)

Modified: settings.cmake
===================================================================
--- settings.cmake	2020-03-19 21:50:20 UTC (rev 601251)
+++ settings.cmake	2020-03-19 21:51:14 UTC (rev 601252)
@@ -71,8 +71,7 @@
 set (pythia6 OFF CACHE BOOL "" FORCE)
 set (pythia6_nolink OFF CACHE BOOL "" FORCE)
 set (pythia8 ON CACHE BOOL "" FORCE)
-# set (python3 ON CACHE BOOL "" FORCE)
-set (python ON CACHE BOOL "" FORCE)
+set (pyroot ON CACHE BOOL "" FORCE)
 set (roofit ON CACHE BOOL "" FORCE)
 set (root7 ON CACHE BOOL "" FORCE)
 set (roottest OFF CACHE BOOL "" FORCE)