[med-svn] [prime-phylo] 01/04: fix building 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 prime-phylo.

commit 24a361a973318d502209213940d45c01825180bb
Author: Sascha Steinbiss <satta at debian.org>
Date:   Mon Jul 25 21:14:10 2016 +0000

    fix building with GCC 6
---
 debian/changelog               |  7 +++++++
 debian/patches/fix-gcc-6.patch | 43 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dfe9d10..1c1b5a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+prime-phylo (1.0.11-3) unstable; urgency=medium
+
+  * Team upload.
+  * FIx building with GCC 6 (Closes: #812031)
+
+ -- Sascha Steinbiss <satta at debian.org>  Mon, 25 Jul 2016 21:13:35 +0000
+
 prime-phylo (1.0.11-2) unstable; urgency=medium
 
   * Add missing Vcs fields.
diff --git a/debian/patches/fix-gcc-6.patch b/debian/patches/fix-gcc-6.patch
new file mode 100644
index 0000000..d972c0e
--- /dev/null
+++ b/debian/patches/fix-gcc-6.patch
@@ -0,0 +1,43 @@
+Description: fix building with GCC 6
+ This patch adds support for GCC 6 by forcing an older C++ standard
+ other than the one used by default now.
+ This also bumps CMake version level used to 3.1, which also required some
+ extra adjustment due to https://cmake.org/cmake/help/v3.0/policy/CMP0026.html.
+Author: Sascha Steinbiss <satta at debian.org>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # Level: trunk/CMakeLists.txt
+ ################################################
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.1)
+ project(prime-phylo CXX)
+ 
+ SET(CMAKE_BUILD_TYPE Debug)
+@@ -14,6 +14,7 @@
+ set(PACKAGE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PROJECT_NAME}-${PACKAGE_VERSION})
+ set(CPACK_GENERATOR RPM;DEB)
++set(CMAKE_CXX_STANDARD 98)
+ 
+ set(tmp_man_pages_dir  ${CMAKE_BINARY_DIR}/tmp_manpages)
+ 
+@@ -132,4 +133,4 @@
+   file(MAKE_DIRECTORY "${vagrantdir}")
+   configure_file(excluded_from_release/packaging/debian/Vagrantfile.cmake "${vagrant_dir}/Vagrantfile" @ONLY)
+   configure_file(excluded_from_release/packaging/debian/provision.sh.cmake "${vagrant_dir}/provision.sh" @ONLY)
+-endif()
+\ No newline at end of file
++endif()
+--- a/src/cxx/CMakeLists.txt
++++ b/src/cxx/CMakeLists.txt
+@@ -363,7 +363,7 @@
+ #===========================================================================
+ 
+ macro(prime_add_tests tests_dir)
+-  get_target_property(program_exe ${programname_of_this_subdir} LOCATION)
++  get_target_property(program_exe ${programname_of_this_subdir} $<TARGET_FILE>)
+   file(GLOB tests RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${tests_dir}/test*[^~])
+   foreach(i ${tests})
+     get_filename_component(test ${i} NAME)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3d5f0df
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-gcc-6.patch

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