[med-svn] [consensuscore] 01/02: Fix build with GCC-6

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository consensuscore.

commit 241ceedf4307557d4cc70cc13c433c6239e4137e
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Sat Jul 16 23:06:01 2016 -0700

    Fix build with GCC-6
    
    Closes: #831172
---
 debian/patches/gcc-6.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
new file mode 100644
index 0000000..cfcac89
--- /dev/null
+++ b/debian/patches/gcc-6.patch
@@ -0,0 +1,28 @@
+Description: Remove -isystem flag to fix build on GCC-6
+Author: Afif Elghraoui <afif at debian.org>
+Forwarded: no
+Last-Update: 2016-07-16
+--- consensuscore.orig/make/Defs.mk
++++ consensuscore/make/Defs.mk
+@@ -53,8 +53,8 @@
+     CXX_STRICT_FLAGS    = $(CXX_FLAGS) -pedantic -std=$(CPP_ABI) -Wall
+ endif
+ 
+-CXX             = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_FLAGS) $(INCLUDES) -isystem $(BOOST) $(LDFLAGS)
+-CXX_STRICT      = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_STRICT_FLAGS) $(INCLUDES) -isystem $(BOOST) $(LDFLAGS)
++CXX             = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_FLAGS) $(INCLUDES) -I$(BOOST) $(LDFLAGS)
++CXX_STRICT      = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_STRICT_FLAGS) $(INCLUDES) -I$(BOOST) $(LDFLAGS)
+ 
+ ifeq ($(UNAME), Darwin)
+     SHLIB_FLAGS = -shared -undefined dynamic_lookup
+--- consensuscore.orig/make/Tests.mk
++++ consensuscore/make/Tests.mk
+@@ -27,7 +27,7 @@
+ 
+ $(TEST_OBJS): $(TEST_BUILD_ROOT)/%.o : %.cpp $(CXX_LIB)
+ 	-mkdir -p $(TEST_BUILD_ROOT)
+-	$(CXX) -isystem $(GMOCK_ROOT) -c $< -o $@
++	$(CXX) -I$(GMOCK_ROOT) -c $< -o $@
+ 
+ $(TESTS_EXECUTABLE): $(TEST_OBJS) $(CXX_LIB) $(GMOCK_LIBSRC) $(GMOCK_MAIN)
+ 	$(CXX) $(COVERAGE) $(TEST_OBJS) $(CXX_LIB) -I$(GMOCK_ROOT) $(GMOCK_LIBSRC) $(GMOCK_MAIN) -lpthread -o $@
diff --git a/debian/patches/series b/debian/patches/series
index 6c4c31d..4c01e7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 spelling.patch
 compiler-flags.patch
+gcc-6.patch

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