passenger 4.0.20 → 4.0.21

data/lib/phusion_passenger/platform_info/cxx_portability.rb

@@ -28,86 +28,160 @@ require 'phusion_passenger/platform_info/operating_system'
 module PhusionPassenger
 
 module PlatformInfo
-	# Compiler flags that should be used for compiling every C/C++ program,
+	# Linker flags that should be used for linking every C/C++ program,
 	# for portability reasons. These flags should be specified as last
-	# when invoking the compiler.
-	def self.portability_cflags
-		flags = ["-D_REENTRANT -I/usr/local/include"]
-		
-		# There are too many implementations of of the hash map!
-		# Figure out the right one.
-		ok = try_compile("Checking for tr1/unordered_map", :cxx, %Q{
-			#include <tr1/unordered_map>
+	# when invoking the linker.
+	def self.portability_ldflags
+		if os_name =~ /solaris/
+			result = '-lxnet -lsocket -lnsl -lpthread'
+		else
+			result = '-lpthread'
+		end
+		result << ' -lrt' if has_rt_library?
+		result << ' -lmath' if has_math_library?
+		return result
+	end
+	memoize :portability_ldflags
+
+	# Extra compiler flags that should always be passed to the C compiler,
+	# last in the command string.
+	def self.default_extra_cflags
+		return default_extra_c_or_cxxflags(:cc)
+	end
+	memoize :default_extra_cflags, true
+
+	# Extra compiler flags that should always be passed to the C++ compiler,
+	# last in the command string.
+	def self.default_extra_cxxflags
+		return default_extra_c_or_cxxflags(:cxx)
+	end
+	memoize :default_extra_cxxflags, true
+
+private
+	def self.check_unordered_map(flags, class_name, header_name, macro_name)
+		ok = try_compile("Checking for unordered_map", :cxx, %Q{
+			#include <#{header_name}>
 			int
 			main() {
-				std::tr1::unordered_map<int, int> m;
+				#{class_name}<int, int> m;
 				return 0;
 			}
 		})
-		if ok
-			flags << "-DHAS_TR1_UNORDERED_MAP"
-		else
-			hash_namespace = nil
-			ok = false
-			['__gnu_cxx', '', 'std', 'stdext'].each do |namespace|
-				['hash_map', 'ext/hash_map'].each do |hash_map_header|
-					ok = try_compile("Checking for #{hash_map_header}", :cxx, %Q{
-						#include <#{hash_map_header}>
-						int
-						main() {
-							#{namespace}::hash_map<int, int> m;
-							return 0;
-						}
-					})
-					if ok
-						hash_namespace = namespace
-						flags << "-DHASH_NAMESPACE=\"#{namespace}\""
-						flags << "-DHASH_MAP_HEADER=\"<#{hash_map_header}>\""
-						flags << "-DHASH_MAP_CLASS=\"hash_map\""
-					end
-					break if ok
-				end
-				break if ok
-			end
-			['ext/hash_fun.h', 'functional', 'tr1/functional',
-			 'ext/stl_hash_fun.h', 'hash_fun.h', 'stl_hash_fun.h',
-			 'stl/_hash_fun.h'].each do |hash_function_header|
-				ok = try_compile("Checking for #{hash_function_header}", :cxx, %Q{
-					#include <#{hash_function_header}>
+		flags << "-D#{macro_name}" if ok
+		return ok
+	end
+	private_class_method :check_unordered_map
+	
+	def self.check_hash_map(flags)
+		hash_namespace = nil
+		ok = false
+		['__gnu_cxx', '', 'std', 'stdext'].each do |namespace|
+			['hash_map', 'ext/hash_map'].each do |hash_map_header|
+				ok = try_compile("Checking for #{hash_map_header}", :cxx, %Q{
+					#include <#{hash_map_header}>
 					int
 					main() {
-						#{hash_namespace}::hash<int>()(5);
+						#{namespace}::hash_map<int, int> m;
 						return 0;
 					}
 				})
 				if ok
-					flags << "-DHASH_FUN_H=\"<#{hash_function_header}>\""
+					hash_namespace = namespace
+					flags << "-DHASH_NAMESPACE=\"#{namespace}\""
+					flags << "-DHASH_MAP_HEADER=\"<#{hash_map_header}>\""
+					flags << "-DHASH_MAP_CLASS=\"hash_map\""
 					break
 				end
 			end
+			break if ok
+		end
+		['ext/hash_fun.h', 'functional', 'tr1/functional',
+		 'ext/stl_hash_fun.h', 'hash_fun.h', 'stl_hash_fun.h',
+		 'stl/_hash_fun.h'].each do |hash_function_header|
+			ok = try_compile("Checking for #{hash_function_header}", :cxx, %Q{
+				#include <#{hash_function_header}>
+				int
+				main() {
+					#{hash_namespace}::hash<int>()(5);
+					return 0;
+				}
+			})
+			if ok
+				flags << "-DHASH_FUN_H=\"<#{hash_function_header}>\""
+				break
+			end
+		end
+	end
+	private_class_method :check_hash_map
+
+	def self.default_extra_c_or_cxxflags(cc_or_cxx)
+		flags = ["-D_REENTRANT", "-I/usr/local/include"]
+
+		if !send("#{cc_or_cxx}_is_sun_studio?")
+			flags << "-Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
+			if send("#{cc_or_cxx}_supports_wno_missing_field_initializers_flag?")
+				flags << "-Wno-missing-field-initializers"
+			end
+			if requires_no_tls_direct_seg_refs? && send("#{cc_or_cxx}_supports_no_tls_direct_seg_refs_option?")
+				flags << "-mno-tls-direct-seg-refs"
+			end
+			# Work around Clang warnings in ev++.h.
+			if send("#{cc_or_cxx}_is_clang?")
+				flags << "-Wno-ambiguous-member-template"
+			end
 		end
 
-		ok = try_compile("Checking for accept4()", :c, %Q{
-			#define _GNU_SOURCE
-			#include <sys/socket.h>
-			static void *foo = accept4;
-		})
-		flags << '-DHAVE_ACCEPT4' if ok
-		
-		if RUBY_PLATFORM =~ /solaris/
-			flags << '-pthreads'
-			if RUBY_PLATFORM =~ /solaris2.11/
+		if !send("#{cc_or_cxx}_is_sun_studio?")
+			flags << "-fcommon"
+			if send("#{cc_or_cxx}_supports_feliminate_unused_debug?")
+				flags << "-feliminate-unused-debug-symbols -feliminate-unused-debug-types"
+			end
+			if send("#{cc_or_cxx}_supports_visibility_flag?")
+				flags << "-fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED"
+				if send("#{cc_or_cxx}_visibility_flag_generates_warnings?") &&
+				   send("#{cc_or_cxx}_supports_wno_attributes_flag?")
+					flags << "-Wno-attributes"
+				end
+			end
+		end
+
+		flags << debugging_cflags
+		flags << '-DHAS_ALLOCA_H' if has_alloca_h?
+		flags << '-DHAVE_ACCEPT4' if has_accept4?
+		flags << '-DHAS_SFENCE' if supports_sfence_instruction?
+		flags << '-DHAS_LFENCE' if supports_lfence_instruction?
+		flags << "-DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
+
+		if cc_or_cxx == :cxx
+			# There are too many implementations of of the hash map!
+			# Figure out the right one.
+			check_unordered_map(flags, "std::unordered_map", "unordered_map", "HAS_UNORDERED_MAP") ||
+				check_unordered_map(flags, "std::tr1::unordered_map", "unordered_map", "HAS_TR1_UNORDERED_MAP") ||
+				check_hash_map(flags)
+		end
+
+		if os_name =~ /solaris/
+			if send("#{cc_or_cxx}_is_sun_studio?")
+				flags << '-mt'
+			else
+				flags << '-pthreads'
+			end
+			if os_name =~ /solaris2\.11/
 				# skip the _XOPEN_SOURCE and _XPG4_2 definitions in later versions of Solaris / OpenIndiana
 				flags << '-D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
 			else
 				flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
-				flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if RUBY_PLATFORM =~ /solaris2.9/
+				flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if os_name =~ /solaris2\.9/
+			end
+			flags << '-DBOOST_HAS_STDINT_H' unless os_name =~ /solaris2\.9/
+			if send("#{cc_or_cxx}_is_sun_studio?")
+				flags << '-xtarget=ultra' if RUBY_PLATFORM =~ /sparc/
+			else
+				flags << '-mcpu=ultrasparc' if RUBY_PLATFORM =~ /sparc/
 			end
-			flags << '-DBOOST_HAS_STDINT_H' unless RUBY_PLATFORM =~ /solaris2.9/
-			flags << '-mcpu=ultrasparc' if RUBY_PLATFORM =~ /sparc/
-		elsif RUBY_PLATFORM =~ /openbsd/
+		elsif os_name =~ /openbsd/
 			flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'
-		elsif RUBY_PLATFORM =~ /aix/
+		elsif os_name =~ /aix/
 			flags << '-pthread'
 			flags << '-DOXT_DISABLE_BACKTRACES'
 		elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux|^arm.*-linux|sh4-linux)/
@@ -116,28 +190,10 @@ module PlatformInfo
 			# http://groups.google.com/group/phusion-passenger/browse_thread/thread/aad4bd9d8d200561
 			flags << '-DBOOST_SP_USE_PTHREADS'
 		end
-		
-		flags << '-DHAS_ALLOCA_H' if has_alloca_h?
-		flags << '-DHAS_SFENCE' if supports_sfence_instruction?
-		flags << '-DHAS_LFENCE' if supports_lfence_instruction?
-		
-		return flags.compact.join(" ").strip
-	end
-	memoize :portability_cflags, true
 
-	# Linker flags that should be used for linking every C/C++ program,
-	# for portability reasons. These flags should be specified as last
-	# when invoking the linker.
-	def self.portability_ldflags
-		if RUBY_PLATFORM =~ /solaris/
-			result = '-lxnet -lrt -lsocket -lnsl -lpthread'
-		else
-			result = '-lpthread'
-		end
-		flags << ' -lmath' if has_math_library?
-		return result
+		return flags.compact.map{ |str| str.strip }.join(" ").strip
 	end
-	memoize :portability_ldflags
+	private_class_method :default_extra_c_or_cxxflags
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/depcheck.rb

@@ -243,8 +243,12 @@ module Depcheck
 			install_instructions("Please install it with <b>urpmi #{package_name}</b>")
 		end
 
-		def yum_install(package_name)
-			install_instructions("Please install it with <b>yum install #{package_name}</b>")
+		def yum_install(package_name, options = {})
+			if options[:epel]
+				install_instructions("Please enable <b>EPEL</b>, then install with <b>yum install #{package_name}</b>")
+			else
+				install_instructions("Please install it with <b>yum install #{package_name}</b>")
+			end
 		end
 
 		def emerge(package_name)
@@ -253,12 +257,18 @@ module Depcheck
 
 		def gem_install(package_name)
 			install_instructions("Please make sure RubyGems is installed, then run " +
-				"<b>#{gem_command || 'gem'} install #{package_name}</b>")
+				"<b>#{gem_command} install #{package_name}</b>")
 		end
 
-		def xcode_install(component)
-			install_instructions("Please install <b>Xcode</b>, then in Xcode go to " +
-				"<b>Preferences -> Downloads -> Components</b> and install <b>#{component}</b>")
+		def install_osx_command_line_tools
+			require 'phusion_passenger/platform_info/compiler'
+			if PlatformInfo.xcode_select_version.to_s >= "2333"
+				install_instructions "Please install the Xcode command line tools: " +
+					"<b>sudo xcode-select --install</b>"
+			else
+				install_instructions "Please install Xcode, then install the command line tools " +
+					"though the menu <b>Xcode -> Preferences -> Downloads -> Components</b>"
+			end
 		end
 
 
@@ -267,7 +277,7 @@ module Depcheck
 		end
 
 		def gem_command
-			PlatformInfo.gem_command
+			PlatformInfo.gem_command(:sudo => true) || 'gem'
 		end
 
 		def find_command(command, *args)

data/lib/phusion_passenger/platform_info/depcheck_specs/apache2.rb

@@ -56,7 +56,7 @@ define 'apache2-dev' do
 		emerge "apache"
 	end
 	on :macosx do
-		xcode_install "Command Line Tools"
+		install_osx_command_line_tools
 	end
 end
 
@@ -89,7 +89,7 @@ define 'apr-dev' do
 		emerge "apr"
 	end
 	on :macosx do
-		xcode_install "Command Line Tools"
+		install_osx_command_line_tools
 	end
 end
 
@@ -119,6 +119,6 @@ define 'apu-dev' do
 		yum_install "apr-util-devel"
 	end
 	on :macosx do
-		xcode_install "Command Line Tools"
+		install_osx_command_line_tools
 	end
 end

data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb

@@ -19,7 +19,7 @@ define 'cc' do
     emerge "gcc"
   end
   on :macosx do
-    xcode_install "Command Line Tools"
+    install_osx_command_line_tools
   end
 end
 
@@ -44,7 +44,7 @@ define 'c++' do
     emerge "gcc"
   end
   on :macosx do
-    xcode_install "Command Line Tools"
+    install_osx_command_line_tools
   end
 end
 
@@ -65,7 +65,7 @@ define 'make' do
     yum_install "make"
   end
   on :macosx do
-    xcode_install "Command Line Tools"
+    install_osx_command_line_tools
   end
   on :other_platforms do
     website "http://www.gnu.org/software/make/"
@@ -89,7 +89,7 @@ define 'gmake' do
     yum_install "make"
   end
   on :macosx do
-    xcode_install "Command Line Tools"
+    install_osx_command_line_tools
   end
   on :other_platforms do
     website "http://www.gnu.org/software/make/"

data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb

@@ -24,7 +24,7 @@ define 'ruby-dev' do
     end
   end
   
-  if ruby_command =~ %r(^/usr/bin/ruby)
+  if ruby_command =~ %r(^/usr/bin/ruby) || ruby_command =~ %r(^/System/Library/Frameworks/Ruby.framework)
     # Only tell user to install the headers with the system's package manager
     # if Ruby itself was installed with the package manager.
     on :debian do
@@ -36,6 +36,9 @@ define 'ruby-dev' do
     on :redhat do
       yum_install "ruby-devel"
     end
+    on :macosx do
+      install_osx_command_line_tools
+    end
   end
   on :other_platforms do
     install_instructions "Please (re)install Ruby by downloading it from <b>#{website}</b>"
@@ -127,12 +130,8 @@ define 'rake' do
     on :mandriva do
       urpmi "rake"
     end
-    on :amazon do
-      # 'yum install rake' installs Ruby 1.9's Rake but Ruby 1.8 is the default -_-
-      gem_install 'rake'
-    end
     on :redhat do
-      yum_install "rake"
+      yum_install "rubygem-rake", :epel => true
     end
   end
   on :other_platforms do

data/lib/phusion_passenger/platform_info/linux.rb

@@ -22,6 +22,7 @@
 #  THE SOFTWARE.
 
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/operating_system'
 
 module PhusionPassenger
 
@@ -41,7 +42,7 @@ module PlatformInfo
 	# distributions it is likely compatible with.
 	# Returns nil if the operating system is not Linux.
 	def self.linux_distro_tags
-		if RUBY_PLATFORM !~ /linux/
+		if os_name != "linux"
 			return nil
 		end
 		lsb_release = read_file("/etc/lsb-release")

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -40,7 +40,7 @@ module PlatformInfo
 	
 	# The current platform's shared library extension ('so' on most Unices).
 	def self.library_extension
-		if RUBY_PLATFORM =~ /darwin/
+		if os_name == "macosx"
 			return "bundle"
 		else
 			return "so"

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -23,6 +23,7 @@
 
 require 'rbconfig'
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/platform_info/operating_system'
 
 module PhusionPassenger
 
@@ -139,10 +140,24 @@ module PlatformInfo
 	end
 	
 	# Returns the correct 'gem' command for this Ruby interpreter.
-	def self.gem_command
-		return locate_ruby_tool('gem')
+	# If `:sudo => true` is given, then the gem command is prefixed by a
+	# sudo command if filesystem permissions require this.
+	def self.gem_command(options = {})
+		command = locate_ruby_tool('gem')
+		if options[:sudo] && gem_install_requires_sudo?
+			command = "#{ruby_sudo_command} #{command}"
+		end
+		return command
 	end
 	memoize :gem_command
+
+	# Returns whether running 'gem install' as the current user requires sudo.
+	def self.gem_install_requires_sudo?
+		`#{gem_command} env` =~ /INSTALLATION DIRECTORY: (.+)/
+		install_dir = $1
+		return !File.writable?(install_dir)
+	end
+	memoize :gem_install_requires_sudo?
 	
 	# Returns the absolute path to the Rake executable that
 	# belongs to the current Ruby interpreter. Returns nil if it
@@ -335,7 +350,7 @@ module PlatformInfo
 
 private
 	def self.locate_ruby_tool_by_basename(name)
-		if RUBY_PLATFORM =~ /darwin/ &&
+		if os_name == "macosx" &&
 		   ruby_command =~ %r(\A/System/Library/Frameworks/Ruby.framework/Versions/.*?/usr/bin/ruby\Z)
 			# On OS X we must look for Ruby binaries in /usr/bin.
 			# RubyGems puts executables (e.g. 'rake') in there, not in