[pkg-nagios-changes] [Git][nagios-team/pkg-icinga2][master] Add patch by Giovanni Mascellani to fix FTBFS with Boost 1.71. (closes: #949836)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-icinga2


Commits:
7ce451c1 by Bas Couwenberg at 2020-01-25T19:10:15+01:00
Add patch by Giovanni Mascellani to fix FTBFS with Boost 1.71. (closes: #949836)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/boost-1.71.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -8,6 +8,8 @@ icinga2 (2.11.2-2) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * Bump Standards-Version to 4.5.0, no changes.
+  * Add patch by Giovanni Mascellani to fix FTBFS with Boost 1.71.
+    (closes: #949836)
 
  -- Debian Janitor <janitor at jelmer.uk>  Sun, 27 Oct 2019 03:14:02 +0000
 


=====================================
debian/patches/boost-1.71.patch
=====================================
@@ -0,0 +1,74 @@
+Description: 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.
+Author: Giovanni Mascellani <gio at debian.org>
+Bug-Debian: https://bugs.debian.org/949836
+Forwarded: https://github.com/Icinga/icinga2/pull/7780
+
+--- 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}


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 21_config_changes
 postgres-checkcommand.patch
+boost-1.71.patch



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/commit/7ce451c1af04139b293c997c1412f0cab5ceb944

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icinga2/commit/7ce451c1af04139b293c997c1412f0cab5ceb944
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20200125/b3eb2235/attachment-0001.html>