[DRE-commits] [passenger] 01/02: Fix FTBFS on kfreebsd in bundled boost library.

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository passenger.

commit 221766c524cc2106836a3820e4cf765eca0067b2
Author: Felix Geyer <fgeyer at debian.org>
Date:   Wed Aug 5 17:58:22 2015 +0200

    Fix FTBFS on kfreebsd in bundled boost library.
    
    * Fix FTBFS on kfreebsd in bundled boost library.
      - Add d/fix_ftbfs_boost.patch, cherry-picked from upstream.
---
 debian/changelog                     |  7 ++++++
 debian/patches/fix_ftbfs_boost.patch | 43 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fc0b313..09d22e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+passenger (5.0.7-3) UNRELEASED; urgency=medium
+
+  * Fix FTBFS on kfreebsd in bundled boost library.
+    - Add d/fix_ftbfs_boost.patch, cherry-picked from upstream.
+
+ -- Felix Geyer <fgeyer at debian.org>  Wed, 05 Aug 2015 17:24:42 +0200
+
 passenger (5.0.7-2) unstable; urgency=medium
 
   * Install /usr/bin/passenger-config. (Closes: #793013)
diff --git a/debian/patches/fix_ftbfs_boost.patch b/debian/patches/fix_ftbfs_boost.patch
new file mode 100644
index 0000000..52958d3
--- /dev/null
+++ b/debian/patches/fix_ftbfs_boost.patch
@@ -0,0 +1,43 @@
+Description: Fix FTBFS with gcc 5 on freebsd.
+Origin: upstream, https://svn.boost.org/trac/boost/ticket/10125
+
+--- a/ext/boost/thread/pthread/once.hpp
++++ b/ext/boost/thread/pthread/once.hpp
+@@ -42,7 +42,7 @@ namespace boost
+   }
+ 
+ #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+     template<typename Function, class ...ArgTypes>
+     inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
+ #else
+@@ -65,7 +65,7 @@ namespace boost
+   private:
+       volatile thread_detail::uintmax_atomic_t epoch;
+ 
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+       template<typename Function, class ...ArgTypes>
+       friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
+ #else
+@@ -118,7 +118,7 @@ namespace boost
+     // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
+ 
+ 
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+ 
+ 
+   template<typename Function, class ...ArgTypes>
+--- a/ext/boost/thread/pthread/once_atomic.hpp
++++ b/ext/boost/thread/pthread/once_atomic.hpp
+@@ -115,7 +115,7 @@ namespace boost
+ #endif
+ 
+ 
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+ 
+   template<typename Function, class ...ArgTypes>
+   inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)
diff --git a/debian/patches/series b/debian/patches/series
index ff45cf9..e7cc9c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_install_path.patch
 system_jsoncpp.patch
 bin_load_path.patch
 nodejs_bin_name.patch
+fix_ftbfs_boost.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/passenger.git