[patch] Patch that modifies the build system to use the system boost.

passenger-2.0.6-system-boost.patch (text/plain), 3.78 KB, created by Hans de Graaff on 2009-01-03 09:53:38 UTC

--- Rakefile.~1~	2009-01-03 10:25:06.402005661 +0100
+++ Rakefile	2009-01-03 10:32:22.290004057 +0100
@@ -83,26 +83,6 @@
 end
 
 
-##### boost::thread static library
-
-subdir 'ext/boost/src' do
-	file 'libboost_thread.a' => Dir['*.cpp'] + Dir['pthread/*.cpp'] do
-		flags = "#{OPTIMIZATION_FLAGS} -fPIC -I../.. #{THREADING_FLAGS} -DNDEBUG #{MULTI_ARCH_FLAGS}"
-		compile_cxx "*.cpp", flags
-		# NOTE: 'compile_cxx "pthread/*.cpp", flags' doesn't work on some systems,
-		# so we do this instead.
-		Dir['pthread/*.cpp'].each do |file|
-			compile_cxx file, flags
-		end
-		create_static_library "libboost_thread.a", "*.o"
-	end
-	
-	task :clean do
-		sh "rm -f libboost_thread.a *.o"
-	end
-end
-
-
 ##### Apache module
 
 class APACHE2
@@ -127,7 +107,6 @@
 	task :apache2 => ['mod_passenger.so', 'ApplicationPoolServerExecutable', :native_support]
 	
 	file 'mod_passenger.so' => [
-		'../boost/src/libboost_thread.a',
 		'mod_passenger.o'
 	] + APACHE2::OBJECTS.keys do
 		# apxs totally sucks. We couldn't get it working correctly
@@ -137,14 +116,13 @@
 		#
 		# Oh, and libtool sucks too. Do we even need it anymore in 2008?
 		linkflags = "#{LDFLAGS} #{MULTI_ARCH_FLAGS}"
-		linkflags << " -lstdc++ -lpthread ../boost/src/libboost_thread.a #{APR_LIBS}"
+		linkflags << " -lstdc++ -lpthread -lboost_thread #{APR_LIBS}"
 		create_shared_library 'mod_passenger.so',
 			APACHE2::OBJECTS.keys.join(' ') << ' mod_passenger.o',
 			linkflags
 	end
 	
 	file 'ApplicationPoolServerExecutable' => [
-		'../boost/src/libboost_thread.a',
 		'ApplicationPoolServerExecutable.cpp',
 		'ApplicationPool.h',
 		'StandardApplicationPool.h',
@@ -156,7 +134,7 @@
 	] do
 		create_executable "ApplicationPoolServerExecutable",
 			'ApplicationPoolServerExecutable.cpp System.o Utils.o Logging.o',
-			"-I.. #{CXXFLAGS} #{LDFLAGS} ../boost/src/libboost_thread.a -lpthread"
+			"-I.. #{CXXFLAGS} #{LDFLAGS} -lboost_thread -lpthread"
 	end
 	
 	file 'mod_passenger.o' => ['mod_passenger.c'] do
@@ -259,8 +237,7 @@
 	end
 
 	file 'Apache2ModuleTests' => TEST::AP2_OBJECTS.keys +
-	  ['../ext/boost/src/libboost_thread.a',
-	   '../ext/apache2/System.o',
+	  ['../ext/apache2/System.o',
 	   '../ext/apache2/Utils.o',
 	   '../ext/apache2/Logging.o'] do
 		objects = TEST::AP2_OBJECTS.keys.join(' ') <<
@@ -269,7 +246,7 @@
 			" ../ext/apache2/Logging.o"
 		create_executable "Apache2ModuleTests", objects,
 			"#{LDFLAGS} #{APR_LIBS} #{MULTI_ARCH_FLAGS} " <<
-			"../ext/boost/src/libboost_thread.a -lpthread"
+			"-lboost_thread -lpthread"
 	end
 	
 	TEST::AP2_OBJECTS.each_pair do |target, sources|
@@ -301,12 +278,11 @@
 subdir 'benchmark' do
 	file 'DummyRequestHandler' => ['DummyRequestHandler.cpp',
 	  '../ext/apache2/MessageChannel.h',
-	  '../ext/apache2/System.o',
-	  '../ext/boost/src/libboost_thread.a'] do
+	  '../ext/apache2/System.o'] do
 		create_executable "DummyRequestHandler", "DummyRequestHandler.cpp",
 			"-I../ext -I../ext/apache2 #{CXXFLAGS} #{LDFLAGS} " <<
 			"../ext/apache2/System.o " <<
-			"../ext/boost/src/libboost_thread.a -lpthread"
+			"-lboost_thread -lpthread"
 	end
 	
 	file 'ApplicationPool' => ['ApplicationPool.cpp',
@@ -315,13 +291,12 @@
 	  '../ext/apache2/System.o',
 	  '../ext/apache2/Logging.o',
 	  '../ext/apache2/Utils.o',
-	  '../ext/boost/src/libboost_thread.a',
 	  :native_support] do
 		create_executable "ApplicationPool", "ApplicationPool.cpp",
 			"-I../ext -I../ext/apache2 #{CXXFLAGS} #{LDFLAGS} " <<
 			"../ext/apache2/System.o ../ext/apache2/Logging.o " <<
 			"../ext/apache2/Utils.o " <<
-			"../ext/boost/src/libboost_thread.a -lpthread"
+			"-lboost_thread -lpthread"
 	end
 	
 	task :clean do
@@ -421,8 +396,6 @@
 		'man/*',
 		'debian/*',
 		'ext/apache2/*.{cpp,h,c,TXT}',
-		'ext/boost/*.{hpp,TXT}',
-		'ext/boost/**/*.{hpp,cpp,pl,inl,ipp}',
 		'ext/passenger/*.{c,rb}',
 		'benchmark/*.{cpp,rb}',
 		'misc/*',