[DRE-commits] [SCM] ruby-passenger.git branch, master, updated. debian/3.0.11debian-1-5-g0e6ec80

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit 72cc6f5dced83bf1cda7d4046a945b21a52dbfd1
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed May 23 18:08:26 2012 +0200

    Add debian/patches/fix_ftbfs_gcc47.patch: Fix FTBFS with GCC 4.7 (Closes: #672096)

diff --git a/debian/changelog b/debian/changelog
index d537daf..3ef3d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ruby-passenger (3.0.12debian-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Add debian/patches/fix_ftbfs_gcc47.patch: Fix FTBFS with GCC 4.7
+    (Closes: #672096)
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 14 May 2012 16:37:50 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 23 May 2012 18:07:51 +0200
 
 ruby-passenger (3.0.11debian-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_ftbfs_gcc47.patch b/debian/patches/fix_ftbfs_gcc47.patch
new file mode 100644
index 0000000..112b4f0
--- /dev/null
+++ b/debian/patches/fix_ftbfs_gcc47.patch
@@ -0,0 +1,28 @@
+Description: Fix FTBFS with GCC 4.7
+Origin: https://svn.boost.org/trac/boost/attachment/ticket/6165/libstdcpp3.hpp.patch
+Bug: https://code.google.com/p/phusion-passenger/issues/detail?id=747
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672096
+
+--- a/ext/boost/config/stdlib/libstdcpp3.hpp
++++ b/ext/boost/config/stdlib/libstdcpp3.hpp
+@@ -31,7 +31,8 @@
+ 
+ #ifdef __GLIBCXX__ // gcc 3.4 and greater:
+ #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+-        || defined(_GLIBCXX__PTHREADS)
++        || defined(_GLIBCXX__PTHREADS) \
++        || defined(_GLIBCXX_HAS_GTHREADS)
+       //
+       // If the std lib has thread support turned on, then turn it on in Boost
+       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
+--- a/ext/common/StaticString.h
++++ b/ext/common/StaticString.h
+@@ -31,6 +31,8 @@
+ #include <ostream>
+ #include <stdexcept>
+ 
++#include <unistd.h>
++
+ namespace Passenger {
+ 
+ using namespace std;
diff --git a/debian/patches/series b/debian/patches/series
index 7a4b3dc..7b2ee10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_install_path.patch
+fix_ftbfs_gcc47.patch

-- 
ruby-passenger.git