[med-svn] [libbpp-phyl] 01/01: Added unforce-cxxflags.patch

[Julien Dutheil]

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

jdutheil-guest pushed a commit to branch master
in repository libbpp-phyl.

commit c4bc05cb06f574aea29c8937fa659760ad91f5a2
Author: Julien Y. Dutheil <dutheil at evolbio.mpg.de>
Date:   Wed Aug 9 16:01:26 2017 +0200

    Added unforce-cxxflags.patch
---
 debian/changelog                      |  6 ++++++
 debian/patches/series                 |  1 +
 debian/patches/unforce-cxxflags.patch | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8c7fc61..ad30be4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libbpp-phyl (2.3.1-10) UNRELEASED; urgency=medium
+
+  * Does not override debian cxx flags anymore.
+
+ -- Julien Dutheil <julien.dutheil at univ-montp2.fr>  Wed, 09 Aug 2017 16:00:22 +0200
+
 libbpp-phyl (2.3.1-9) unstable; urgency=medium
 
   * Further increased time out limit for unit tests.
diff --git a/debian/patches/series b/debian/patches/series
index 95e0b27..572f22c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+unforce-cxxflags.patch
 relax_test_timeout.patch
 0002-Fixed-unit-tests-compilation-on-some-platforms.patch
 remove_deprecated_warnings.patch
diff --git a/debian/patches/unforce-cxxflags.patch b/debian/patches/unforce-cxxflags.patch
new file mode 100644
index 0000000..c2e404d
--- /dev/null
+++ b/debian/patches/unforce-cxxflags.patch
@@ -0,0 +1,17 @@
+From: Gert Wollny <gw.fossdev at gmail.com>
+Date: Wed, 29 Jun 2014 16:52:43 +0200
+Subject: Do not override Debian CXX flags
+Comment: Upstream version 2.3.0 now has additional -std=c++11 which might
+         be needed to be added explicitly
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,7 +9,7 @@ cmake_minimum_required (VERSION 2.8.11)
+ project (bpp-phyl CXX)
+ 
+ # Compile options
+-set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
++# set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
+ 
+ IF(NOT CMAKE_BUILD_TYPE)
+   SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING

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