forked from pool/nginx
22 lines
1.2 KiB
Diff
22 lines
1.2 KiB
Diff
diff -Ppru passenger/build/common_library.rb passenger/build/common_library.rb
|
|
--- passenger/build/common_library.rb 2012-07-16 21:23:58.000000000 +0200
|
|
+++ passenger/build/common_library.rb 2014-01-17 13:44:58.830352986 +0100
|
|
@@ -94,7 +94,7 @@ def define_common_library_task(namespace
|
|
static_library = "#{output_dir}.a"
|
|
|
|
# Define compilation targets for the object files in libpassenger_common.
|
|
- flags = "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} "
|
|
+ flags = "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} -fPIC #{ENV['RPM_OPT_FLAGS']} "
|
|
flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
|
|
flags.strip!
|
|
|
|
@@ -162,7 +162,7 @@ end
|
|
# Defines tasks for compiling a static library containing Boost and OXT.
|
|
def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
|
|
output_file = "#{output_dir}.a"
|
|
- flags = "-Iext #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
|
|
+ flags = "-Iext #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS} -fPIC #{ENV['RPM_OPT_FLAGS']}"
|
|
|
|
if boolean_option('RELEASE')
|
|
sources = Dir['ext/boost/src/pthread/*.cpp'] + Dir['ext/oxt/*.cpp']
|