enable C++17 and libTable

3 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a5f689b40d9..a1edcf1ea7d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = root
 	pkgdesc = C++ data analysis framework and interpreter from CERN.
 	pkgver = 6.12.06
-	pkgrel = 1
+	pkgrel = 2
 	url = http://root.cern.ch
 	install = root.install
 	arch = i686
@@ -49,7 +49,7 @@ pkgbase = root
 	sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
 	sha256sums = 50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0
 	sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
-	sha256sums = 386a62013e10130b6d0fffcee3ea31abf9e125a14e38a513eb8142fec6bf4410
+	sha256sums = a50f00f91814dc246cd925790aa3266135954f1d1ac50100213e95ef0f763bff
 
 pkgname = root
 
diff --git a/PKGBUILD b/PKGBUILD
index e75e74be6a51..3eb0b4e99403 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=root
 pkgver=6.12.06
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -54,32 +54,32 @@ sha256sums=('aedcfd2257806e425b9f61b483e25ba600eb0ea606e21262eafaa9dc745aa794'
             '9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
             '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
-            '386a62013e10130b6d0fffcee3ea31abf9e125a14e38a513eb8142fec6bf4410')
+            'a50f00f91814dc246cd925790aa3266135954f1d1ac50100213e95ef0f763bff')
 prepare() {
     cd "${pkgname}-${pkgver}"
 
     msg2 'Adjusting to Python3...'
     2to3 -w etc/dictpch/makepch.py 2>&1 > /dev/null
-}
 
-build() {
     mkdir -p "${srcdir}/build"
     cd "${srcdir}/build"
 
-    msg2 'Configuring...'
     CFLAGS="${CFLAGS} -pthread" \
     CXXFLAGS="${CXXFLAGS} -pthread" \
     LDFLAGS="${LDFLAGS} -pthread -Wl,--no-undefined" \
     cmake -C "${srcdir}/settings.cmake" "${srcdir}/${pkgname}-${pkgver}"
+}
+
+build() {
+    mkdir -p "${srcdir}/build"
+    cd "${srcdir}/build"
 
-    msg2 'Compiling...'
     make ${MAKEFLAGS}
 }
 
 package() {
     cd "${srcdir}/build"
 
-    msg2 'Installing...'
     make DESTDIR="${pkgdir}" install
 
     install -D "${srcdir}/root.sh" \
diff --git a/settings.cmake b/settings.cmake
index 122e1bd3b43a..bc896bcbdfba 100644
--- a/settings.cmake
+++ b/settings.cmake
@@ -19,7 +19,7 @@ set (builtin_zlib OFF CACHE BOOL "" FORCE)
 set (castor OFF CACHE BOOL "" FORCE)
 set (chirp OFF CACHE BOOL "" FORCE)
 set (cling ON CACHE BOOL "" FORCE)
-set (cxx14 ON CACHE BOOL "" FORCE)
+set (cxx17 ON CACHE BOOL "" FORCE)
 set (davix OFF CACHE BOOL "" FORCE)
 set (dcache OFF CACHE BOOL "" FORCE)
 set (fail-on-missing ON CACHE BOOL "" FORCE)
@@ -48,6 +48,7 @@ set (rfio OFF CACHE BOOL "" FORCE)
 set (roofit ON CACHE BOOL "" FORCE)
 set (shared ON CACHE BOOL "" FORCE)
 set (tbb ON CACHE BOOL "" FORCE)
+set (table ON CACHE BOOL "" FORCE)
 set (testing OFF CACHE BOOL "" FORCE)
 set (tmva ON CACHE BOOL "" FORCE)
 set (unuran ON CACHE BOOL "" FORCE)