[Pkg-nagios-changes] [pkg-icinga2] 01/01: Add patch 42_mips_boost_bind_workaround

[Markus Frosch]

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

lazyfrosch pushed a commit to branch master
in repository pkg-icinga2.

commit 5c10b76f008884397b22cdb3d60987cdb8b43b7f
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Fri Dec 16 18:29:27 2016 +0100

    Add patch 42_mips_boost_bind_workaround
---
 debian/patches/42_mips_boost_bind_workaround | 50 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 51 insertions(+)

diff --git a/debian/patches/42_mips_boost_bind_workaround b/debian/patches/42_mips_boost_bind_workaround
new file mode 100644
index 0000000..c1ed13e
--- /dev/null
+++ b/debian/patches/42_mips_boost_bind_workaround
@@ -0,0 +1,50 @@
+Description: Working around MIPS* build problems with boost::bind
+Bug: https://dev.icinga.com/issues/13403
+Reviewed-by: Markus Frosch <lazyfrosch at debian.org>
+Last-Update: 2016-12-16
+---
+commit 5985134bf3650d3cb0dac5531db5e2ffc95ce681
+Author: Markus Frosch <markus.frosch at icinga.com>
+Date:   Fri Dec 16 18:26:43 2016 +0100
+
+    test/base-timer: Workaround boost::bind problem on mips* architectures
+    
+    refs #13403
+
+diff --git a/test/base-timer.cpp b/test/base-timer.cpp
+index cd4404f..1f94dc6 100644
+--- a/test/base-timer.cpp
++++ b/test/base-timer.cpp
+@@ -39,16 +39,17 @@ BOOST_AUTO_TEST_CASE(interval)
+ 	BOOST_CHECK(timer->GetInterval() == 1.5);
+ }
+ 
+-static void Callback(int *counter)
++int counter = 0;
++
++static void Callback(const Timer::Ptr&)
+ {
+-	(*counter)++;
++	counter++;
+ }
+ 
+ BOOST_AUTO_TEST_CASE(invoke)
+ {
+-	int counter;
+ 	Timer::Ptr timer = new Timer();
+-	timer->OnTimerExpired.connect(boost::bind(&Callback, &counter));
++	timer->OnTimerExpired.connect(&Callback);
+ 	timer->SetInterval(1);
+ 
+ 	counter = 0;
+@@ -61,9 +62,8 @@ BOOST_AUTO_TEST_CASE(invoke)
+ 
+ BOOST_AUTO_TEST_CASE(scope)
+ {
+-	int counter;
+ 	Timer::Ptr timer = new Timer();
+-	timer->OnTimerExpired.connect(boost::bind(&Callback, &counter));
++	timer->OnTimerExpired.connect(&Callback);
+ 	timer->SetInterval(1);
+ 
+ 	counter = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 273b30f..5f71380 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 21_config_changes
 41_ido_mysql57
+42_mips_boost_bind_workaround

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git