enable C++17

3 files changed, 10 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6f2ebb879dd..9d618a1f39b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = root-extra
 	pkgdesc = C++ data analysis framework and interpreter from CERN with extra features enabled.
 	pkgver = 6.12.06
-	pkgrel = 2
+	pkgrel = 3
 	url = http://root.cern.ch
 	install = root-extra.install
 	arch = i686
@@ -52,7 +52,7 @@ pkgbase = root-extra
 	sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
 	sha256sums = 50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0
 	sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
-	sha256sums = bfc4f0177f7825984db5f23cb998ddaa325ec101664d22da6f74bc79bd73db6f
+	sha256sums = f50cf123c41048f8a5b19949688804749cec60dff665ebc9a296fd1a587e5e5c
 
 pkgname = root-extra
 
diff --git a/PKGBUILD b/PKGBUILD
index fc9b0a5f5f55..15ce52e1cb89 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=root-extra
 _pkgname=root
 pkgver=6.12.06
-pkgrel=2
+pkgrel=3
 provides=('root' 'root-extra')
 conflicts=('root')
 pkgdesc='C++ data analysis framework and interpreter from CERN with extra features enabled.'
@@ -57,15 +57,13 @@ sha256sums=('aedcfd2257806e425b9f61b483e25ba600eb0ea606e21262eafaa9dc745aa794'
             '9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
             '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
-            'bfc4f0177f7825984db5f23cb998ddaa325ec101664d22da6f74bc79bd73db6f')
+            'f50cf123c41048f8a5b19949688804749cec60dff665ebc9a296fd1a587e5e5c')
 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"
 
@@ -74,15 +72,18 @@ build() {
     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 1338bc7b3d1d..acd3d14b4f50 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)