Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
'beep::' is redundant inside 'namespace beep' block
· 7edf3568
Andreas Tille
authored
May 22, 2018
7edf3568
Upload to unstable
· 4d6a6f0d
Andreas Tille
authored
May 22, 2018
4d6a6f0d
Show whitespace changes
Inline
Side-by-side
debian/changelog
View file @
4d6a6f0d
prime-phylo (1.0.11-6) unstable; urgency=medium
[ Juhani Numminen ]
* 'beep::' is redundant inside 'namespace beep' block
Closes: #897837
-- Andreas Tille <tille@debian.org> Tue, 22 May 2018 14:12:53 +0200
prime-phylo (1.0.11-5) unstable; urgency=medium
[ Andreas Tille ]
...
...
debian/patches/fix-gcc-6.patch
deleted
100644 → 0
View file @
acdee466
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@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)
debian/patches/fix-gcc-8.patch
0 → 100644
View file @
4d6a6f0d
Description: 'beep::' is redundant inside 'namespace beep' block
Fixes FTBFS with GCC 8: PrimeOptionMap.hh:162:33: error:
'std::ostream& beep::operator<<(std::ostream&, const beep::PrimeOptionMap&)'
should have been declared inside 'beep'
Author: Juhani Numminen <juhaninumminen0@gmail.com>
Bug-Debian: https://bugs.debian.org/897837
Last-Update: 2018-05-22
--- a/src/cxx/libraries/prime/PrimeOptionMap.hh
+++ b/src/cxx/libraries/prime/PrimeOptionMap.hh
@@ -158,9 +158,9 @@
bool parseOptions(int& argIndex, int argc, char **argv);
//! IO
- friend std::ostream& beep::operator<<(std::ostream& o,
+ friend std::ostream& operator<<(std::ostream& o,
const PrimeOptionMap& pom);
- friend std::ostream& beep::operator<<(std::ostream& o,
+ friend std::ostream& operator<<(std::ostream& o,
const PrimeOption& po);
static std::string formatMessage(std::string opt, std::string usageText);
debian/patches/series
View file @
4d6a6f0d
# fix-gcc-6.patch
fix-ftbfs-with-Boost160.patch
fix-gcc-8.patch