Package: passenger Version: 2.2.5debian1-1 Severity: important Tags: patch User: debian-...@superh.org Usertags: sh4 X-Debbugs-CC: debian-sup...@lists.debian.org
Hi, I am now trying to run Debian on Renesas SH(sh4) CPU. http://buildd.debian-ports.org/status/architecture.php?suite=unstable&a=sh4&buildd= passenger FTBFS on sh4. http://buildd.debian-ports.org/fetch.php?pkg=passenger&arch=sh4&ver=2.2.5debian1-1&stamp=1257830668&file=log&as=raw Because build of sh4 needs -DBOOST_SP_USE_PTHREADS option like arm and sparc. But this option is not enable. I made the patch which revised this problem. I confirm that sh4 can build by applying this patch. Could you apply this patch? Best regards, Nobuhiro
diff --git a/doc/rdoc/classes/PlatformInfo.html b/doc/rdoc/classes/PlatformInfo.html index 0ea5628..6a93cf7 100644 --- a/doc/rdoc/classes/PlatformInfo.html +++ b/doc/rdoc/classes/PlatformInfo.html @@ -742,7 +742,7 @@ the compiler. 346: <span class="ruby-identifier">flags</span> <span class="ruby-operator"><<</span> <span class="ruby-value str">'-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'</span> 347: <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/aix/</span> 348: <span class="ruby-identifier">flags</span> <span class="ruby-operator"><<</span> <span class="ruby-value str">'-DOXT_DISABLE_BACKTRACES'</span> -349: <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/(sparc-linux|arm-linux)/</span> +349: <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_PLATFORM</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/(sparc-linux|arm-linux|sh4-linux)/</span> 350: <span class="ruby-comment cmt"># http://code.google.com/p/phusion-passenger/issues/detail?id=200</span> 351: <span class="ruby-comment cmt"># http://groups.google.com/group/phusion-passenger/t/6b904a962ee28e5c</span> 352: <span class="ruby-identifier">flags</span> <span class="ruby-operator"><<</span> <span class="ruby-value str">'-DBOOST_SP_USE_PTHREADS'</span> @@ -829,4 +829,4 @@ current Ruby interpreter. Returns nil if it doesn‘t exist. </div> </body> -</html> \ No newline at end of file +</html> diff --git a/lib/phusion_passenger/platform_info.rb b/lib/phusion_passenger/platform_info.rb index 718eae9..ba27006 100644 --- a/lib/phusion_passenger/platform_info.rb +++ b/lib/phusion_passenger/platform_info.rb @@ -346,7 +346,7 @@ public flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS' elsif RUBY_PLATFORM =~ /aix/ flags << '-DOXT_DISABLE_BACKTRACES' - elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux)/ + elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux|sh4-linux)/ # http://code.google.com/p/phusion-passenger/issues/detail?id=200 # http://groups.google.com/group/phusion-passenger/t/6b904a962ee28e5c flags << '-DBOOST_SP_USE_PTHREADS'