[med-svn] [swarm-cluster] 01/06: fix compiling with GCC 6

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository swarm-cluster.

commit 960159a9a4ee624f0ef2315972f4548280bcbdd2
Author: Sascha Steinbiss <satta at debian.org>
Date:   Sat Jul 23 10:06:36 2016 +0000

    fix compiling with GCC 6
---
 debian/changelog                        |  9 +++++++++
 debian/patches/allow_cxx_override.patch | 13 +++++++++++++
 debian/patches/fix_gcc6.patch           | 11 +++++++++++
 debian/patches/series                   |  2 ++
 4 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 48d6f30..1e6462b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+swarm-cluster (2.1.8-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Allow building with GCC 6.
+    Closes: #811893
+  * Allow to override $CXX.
+
+ -- Sascha Steinbiss <satta at debian.org>  Sat, 23 Jul 2016 10:04:50 +0000
+
 swarm-cluster (2.1.8-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/patches/allow_cxx_override.patch b/debian/patches/allow_cxx_override.patch
new file mode 100644
index 0000000..737e735
--- /dev/null
+++ b/debian/patches/allow_cxx_override.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -30,8 +30,8 @@
+ LIBS=-lpthread
+ LINKFLAGS=$(COMMON) $(LDFLAGS)
+ 
+-CXX=g++
+-CXXFLAGS=$(COMPILEOPT) $(COMMON)
++CXX?=g++
++CXXFLAGS+=$(COMPILEOPT) $(COMMON)
+ 
+ PROG=swarm
+ 
diff --git a/debian/patches/fix_gcc6.patch b/debian/patches/fix_gcc6.patch
new file mode 100644
index 0000000..b48f025
--- /dev/null
+++ b/debian/patches/fix_gcc6.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -25,7 +25,7 @@
+ #COMMON=-pg -g
+ COMMON=-g
+ 
+-COMPILEOPT=-Wall -Wsign-compare -O3 -msse2 -mtune=core2 -Icityhash
++COMPILEOPT=-Wall -Wsign-compare -O3 -msse2 -mtune=core2 -Icityhash -std=gnu++98
+ 
+ LIBS=-lpthread
+ LINKFLAGS=$(COMMON) $(LDFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 814900f..513dc4a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 hardening.patch
+allow_cxx_override.patch
+fix_gcc6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/swarm-cluster.git