Bug#949836: FTBFS with Boost 1.71

2020-01-25 Thread Sebastiaan Couwenberg
Control: tags -1 upstream
Control: forwarded -1 https://github.com/Icinga/icinga2/pull/7780

Thanks for the patch, it's applied in git and forwarded upstream.

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



signature.asc
Description: OpenPGP digital signature


Bug#949836: FTBFS with Boost 1.71

2020-01-25 Thread Giovanni Mascellani
Package: icinga2
Version: 2.11.2-2
Severity: wishlist
Tags: patch
User: team+bo...@tracker.debian.org
Usertags: boost1.71

Dear Maintainer,

your package fails to build with boost1.71. You can find a build log
attached. If you want to attempt the build yourself, an updated version
of boost-defaults which brings in boost1.71 dependencies can be found
adding this line to your sources.list file:

  deb https://people.debian.org/~gio/reprepro gio main

This bug has severity whishlist for the moment, but it will raised to RC
as soon as version 1.71 of Boost is promoted to default.

More specifically, your package fails building because a CMake routine
incorrectly thinks it is using a very old version of Boost. This is due
to that routine expecting the Boost version in a format different from
the current one.

The attached patch should fix the bug.

Thanks and all the best, Giovanni.
-- 
Giovanni Mascellani 
Postdoc researcher - Université Libre de Bruxelles
From 68f57c3398d4ee5da547b8d9bee74512fe68954c Mon Sep 17 00:00:00 2001
From: Giovanni Mascellani 
Date: Sat, 25 Jan 2020 18:39:25 +0100
Subject: [PATCH] Fix building with Boost 1.71.

---
 .../0003-Fix-building-with-Boost-1.71.patch   | 79 +++
 debian/patches/series |  1 +
 2 files changed, 80 insertions(+)
 create mode 100644 debian/patches/0003-Fix-building-with-Boost-1.71.patch

diff --git a/debian/patches/0003-Fix-building-with-Boost-1.71.patch b/debian/patches/0003-Fix-building-with-Boost-1.71.patch
new file mode 100644
index ..adaf898a
--- /dev/null
+++ b/debian/patches/0003-Fix-building-with-Boost-1.71.patch
@@ -0,0 +1,79 @@
+From: Giovanni Mascellani 
+Date: Sat, 25 Jan 2020 18:37:57 +0100
+Subject: Fix building with Boost 1.71.
+
+The CMake file that detects Boost.Test version uses an older version
+format, and incorrectly thinks that the available Boost version is
+very old. This patch removes the version check, since Debian already
+has a sufficiently recent Boost version.
+---
+ third-party/cmake/BoostTestTargets.cmake | 38 
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/third-party/cmake/BoostTestTargets.cmake b/third-party/cmake/BoostTestTargets.cmake
+index 8c26324..98f0602 100644
+--- a/third-party/cmake/BoostTestTargets.cmake
 b/third-party/cmake/BoostTestTargets.cmake
+@@ -47,27 +47,27 @@ set(BOOST_TEST_TARGET_PREFIX "boosttest")
+ if(NOT Boost_FOUND)
+ 	find_package(Boost 1.34.0 QUIET)
+ endif()
+-if("${Boost_VERSION}0" LESS "1034000")
+-	set(_shared_msg
+-		"NOTE: boost::test-based targets and tests cannot "
+-		"be added: boost >= 1.34.0 required but not found. "
+-		"(found: '${Boost_VERSION}'; want >=103400) ")
+-	if(BUILD_TESTING)
+-		message(FATAL_ERROR
+-			${_shared_msg}
+-			"You may disable BUILD_TESTING to continue without the "
+-			"tests.")
+-	else()
+-		message(STATUS
+-			${_shared_msg}
+-			"BUILD_TESTING disabled, so continuing anyway.")
+-	endif()
+-endif()
++# if("${Boost_VERSION}0" LESS "1034000")
++# 	set(_shared_msg
++# 		"NOTE: boost::test-based targets and tests cannot "
++# 		"be added: boost >= 1.34.0 required but not found. "
++# 		"(found: '${Boost_VERSION}'; want >=103400) ")
++# 	if(BUILD_TESTING)
++# 		message(FATAL_ERROR
++# 			${_shared_msg}
++# 			"You may disable BUILD_TESTING to continue without the "
++# 			"tests.")
++# 	else()
++# 		message(STATUS
++# 			${_shared_msg}
++# 			"BUILD_TESTING disabled, so continuing anyway.")
++# 	endif()
++# endif()
+ 
+ include(GetForceIncludeDefinitions)
+ include(CopyResourcesToBuildTree)
+ 
+-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++if(Boost_FOUND)
+ 	set(_boosttesttargets_libs)
+ 	set(_boostConfig "BoostTestTargetsIncluded.h")
+ 	if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+@@ -144,7 +144,7 @@ function(add_boost_test _name)
+ 			"Syntax error in use of add_boost_test: at least one source file required!")
+ 	endif()
+ 
+-	if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++	if(Boost_FOUND)
+ 
+ 		include_directories(${Boost_INCLUDE_DIRS})
+ 
+@@ -236,7 +236,7 @@ function(add_boost_test _name)
+ 			set(_test_command ${_target_name})
+ 		endif()
+ 
+-		if(TESTS AND "${Boost_VERSION}" VERSION_GREATER "103799")
++		if(TESTS)
+ 			foreach(_test ${TESTS})
+ add_test(NAME
+ 	${_name}-${_test}
diff --git a/debian/patches/series b/debian/patches/series
index 6bcd4174..189d1033 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 21_config_changes
 postgres-checkcommand.patch
+0003-Fix-building-with-Boost-1.71.patch
-- 
2.25.0



icinga2.log.gz
Description: application/gzip


signature.asc
Description: OpenPGP digital signature