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

[Konstantin Gizdov]

    Date: Thursday, April 2, 2020 @ 17:10:11
  Author: kgizdov
Revision: 610154

xrootd rebuild

Modified:
  root/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-02 17:01:12 UTC (rev 610153)
+++ PKGBUILD	2020-04-02 17:10:11 UTC (rev 610154)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.20.02
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -101,11 +101,14 @@
 
     # specify some custom flags
     # needed by vc to link properly
-    CUSTOM_CMAKE_FLAGS="-DTARGET_ARCHITECTURE:STRING=generic "
+    CUSTOM_CMAKE_FLAGS="-DTARGET_ARCHITECTURE:STRING=generic"
     # make sure it finds python
-    CUSTOM_CMAKE_FLAGS+="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python "
+    CUSTOM_CMAKE_FLAGS+=" -DPYTHON_EXECUTABLE:PATH=/usr/bin/python"
     # need to set install prefix like so
-    CUSTOM_CMAKE_FLAGS+="-DINSTALL_PREFIX=/usr "
+    CUSTOM_CMAKE_FLAGS+=" -DINSTALL_PREFIX=/usr"
+    export CUSTOM_CMAKE_FLAGS
+
+    # update system flags
     # don't let ROOT play around with lib paths
     # the following is no longer necessary
     # sed -i -e 's at SetLibraryPath();@@g' \
@@ -112,14 +115,15 @@
     #     "${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
+    export CPPFLAGS="${CPPFLAGS} -DIS_RPATH_BUILD=1"
+    # make sure pthread gets detected
+    CUSTOM_COMPILER_FLAGS="${CPPFLAGS} -pthread"
+    export CFLAGS="${CFLAGS} ${CUSTOM_COMPILER_FLAGS}"
+    export CXXFLAGS="${CXXFLAGS} ${CUSTOM_COMPILER_FLAGS}"
+    # do not link undefined
+    CUSTOM_COMPILER_FLAGS+=" -Wl,--no-undefined"
+    export LDFLAGS="${LDFLAGS} ${CUSTOM_COMPILER_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"