summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Löher2017-04-05 16:53:35 +0200
committerBastian Löher2017-04-05 16:53:35 +0200
commitd295249578eb9f255dcdcab4a18f33d21de1af19 (patch)
tree19e58a6a398032a995039b04d413eded3e916b69
parent1fe07676f06450b2ba9815b1b5e663264b4e9e37 (diff)
downloadaur-d295249578eb9f255dcdcab4a18f33d21de1af19.tar.gz
Add patch to make c++1y mandatory (fixup 3).
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD9
2 files changed, 5 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 37e79a487eb5..ec46d53e9ea2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = fairroot
pkgdesc = Analysis framework based on root provided by GSI/FAIR.
pkgver = 17.03
- pkgrel = 3
+ pkgrel = 4
url = http://fairroot.gsi.de
install = fairroot.install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 6bc2165638db..8a6897b35e64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=fairroot
pkgver=17.03
fairsoftver=mar17-1
-pkgrel=3
+pkgrel=4
pkgdesc="Analysis framework based on root provided by GSI/FAIR."
arch=('x86_64')
url="http://fairroot.gsi.de"
@@ -48,10 +48,9 @@ prepare() {
cd ${srcdir}
[ -d build ] || mkdir build
cd build
- sed -ie "s/std=c++11/std=c++14/" ../FairRoot-v-17.03/CMakeLists.txt
- sed -ie "s/std=c++11/std=c++14/" ../FairRoot-v-17.03/CMakeLists.txte
- sed -ie "s/std=c++11/std=c++14/" ../FairRoot-v-17.03/cmake/checks/CMakeLists.txt
- sed -ie "s/std=c++11/std=c++14/" ../FairRoot-v-17.03/cmake/modules/CheckCXX11Feitures.cmake
+ sed -i "s/std=c++11/std=c++1y/" ../FairRoot-v-17.03/CMakeLists.txt
+ sed -i "s/std=c++11/std=c++1y/" ../FairRoot-v-17.03/cmake/checks/CMakeLists.txt
+ sed -i "s/std=c++11/std=c++1y/" ../FairRoot-v-17.03/cmake/modules/CheckCXX11Features.cmake
cmake \
-DUSE_DIFFERENT_COMPILER=TRUE \
-DCMAKE_INSTALL_PREFIX="/opt/fairroot/v-${pkgver}" \