File rubygem-passenger-3.0.12_boost_threads.patch of Package rubygem-passenger

File rubygem-passenger-3.0.12_boost_threads.patch of Package rubygem-passenger (Revision 83f7d73ed1dfc9d10af165e7d652e5ec)

Currently displaying revision 83f7d73ed1dfc9d10af165e7d652e5ec, show latest

Index: ext/boost/config/stdlib/libstdcpp3.hpp
===================================================================
--- ext/boost/config/stdlib/libstdcpp3.hpp.orig
+++ ext/boost/config/stdlib/libstdcpp3.hpp
@@ -39,17 +39,14 @@
       // while others do not...
       //
 #     define BOOST_HAS_THREADS
-#  else
-#     define BOOST_DISABLE_THREADS
 #  endif
 #elif defined(__GLIBCPP__) \
         && !defined(_GLIBCPP_HAVE_GTHR_DEFAULT) \
         && !defined(_GLIBCPP__PTHREADS)
    // disable thread support if the std lib was built single threaded:
-#  define BOOST_DISABLE_THREADS
 #endif
 
-#if (defined(linux) || defined(__linux) || defined(__linux__)) && defined(__arm__) && defined(_GLIBCPP_HAVE_GTHR_DEFAULT)
+#if (defined(linux) || defined(__linux) || defined(__linux__))
 // linux on arm apparently doesn't define _REENTRANT
 // so just turn on threading support whenever the std lib is thread safe:
 #  define BOOST_HAS_THREADS
Index: ext/boost/config/compiler/gcc.hpp
===================================================================
--- ext/boost/config/compiler/gcc.hpp.orig
+++ ext/boost/config/compiler/gcc.hpp
@@ -93,7 +93,7 @@
 // those platforms where we can know for sure). It will get turned off again
 // later if no threading API is detected.
 //
-#if !defined(__MINGW32__) && !defined(linux) && !defined(__linux) && !defined(__linux__)
+#if !defined(__MINGW32__)
 # define BOOST_HAS_THREADS
 #endif 
 
Index: ext/common/StaticString.h
===================================================================
--- ext/common/StaticString.h.orig
+++ ext/common/StaticString.h
@@ -31,6 +31,7 @@
 #include <cstddef>
 #include <ostream>
 #include <stdexcept>
+#include <sys/types.h>
 
 namespace Passenger {