compile with gcc5

3 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cdbd126e804e..39f80d0b82bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Jun  2 17:28:31 UTC 2017
+# Mon Jun  5 04:52:04 UTC 2017
 pkgbase = torque
 	pkgdesc = An open source resource manager providing control over batch jobs and distributed compute nodes
 	pkgver = 6.1.1.1
@@ -16,6 +16,7 @@ pkgbase = torque
 	depends = libxml2
 	depends = tk
 	depends = boost-libs
+	depends = gcc5
 	options = !libtool
 	backup = var/spool/torque/server_name
 	backup = var/spool/torque/mom_priv/config
diff --git a/.gitignore b/.gitignore
index dc50fdfd6110..2269feac6eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.sw*
 *.pkg*
 *.tar.gz
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 36a142bce70d..4335f500fec2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc='An open source resource manager providing control over batch jobs and d
 arch=('i686' 'x86_64')
 url="http://www.adaptivecomputing.com/products/open-source/torque/"
 license=('custom')
-depends=('openssh' 'libxml2' 'tk' 'boost-libs')
+depends=('openssh' 'libxml2' 'tk' 'boost-libs' 'gcc5')
 makedepends=('make' 'gcc' 'boost')
 backup=(var/spool/torque/server_name var/spool/torque/mom_priv/config var/spool/torque/serv_priv/{nodes,serverdb})
 options=(!libtool)
@@ -21,7 +21,7 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	sed 's/#include <sys\/tty.h>/#include <linux\/tty.h>/' -i src/resmom/mom_inter.c
 	sed 's/\/sbin\/ldconfig/:/g' -i src/resmom/Makefile.{am,in}
-	CPPFLAGS="-DUSE_INTERP_ERRORLINE -DUSE_INTERP_RESULT -Wno-misleading-indentation -Wno-deprecated-declarations" ./configure --prefix="/usr" --sbindir="/usr/bin" --disable-gui
+	CXX=g++-5 CPPFLAGS="--std=c++0x -Wno-deprecated-declarations" ./configure --prefix="/usr" --sbindir="/usr/bin" --disable-gui
 	make
 }