diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2013-05-28 16:03:07 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2013-05-28 16:03:07 +0000 |
| commit | a6ced1ba932784b6d8e3c693203bd1f75917a12c (patch) | |
| tree | 559266ab12d1e2ee540e6500786ff5adbb9ac875 /www/nginx-devel/files | |
| parent | fe65acf33b55bee867e8dfb8ed84da611e3d12d8 (diff) | |
| download | ports-a6ced1ba932784b6d8e3c693203bd1f75917a12c.tar.gz ports-a6ced1ba932784b6d8e3c693203bd1f75917a12c.zip | |
Notes
Diffstat (limited to 'www/nginx-devel/files')
| -rw-r--r-- | www/nginx-devel/files/extra-patch-passenger-build-nginx.rb | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb index 0780fb1f46ac..5d67be3c3a42 100644 --- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb +++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb @@ -1,34 +1,18 @@ ---- ../passenger-3.0.19/build/nginx.rb.orig 2010-12-07 13:57:32.000000000 +0300 -+++ ../passenger-3.0.19/build/nginx.rb 2010-12-07 13:58:13.000000000 +0300 -@@ -23,10 +23,7 @@ - - desc "Build Nginx helper agent" +--- ../passenger-4.0.4/build/nginx.rb.orig 2013-05-28 01:13:38.000000000 +0400 ++++ ../passenger-4.0.4/build/nginx.rb 2013-05-28 19:21:20.000000000 +0400 +@@ -24,14 +24,11 @@ + desc "Build Nginx support files" task :nginx => [ -- AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent', + :nginx_without_native_support, ++ LIBBOOST_OXT, + NATIVE_SUPPORT_TARGET + ].compact + + task :nginx_without_native_support => [ +- AGENT_OUTPUT_DIR + 'PassengerHelperAgent', - AGENT_OUTPUT_DIR + 'PassengerWatchdog', - AGENT_OUTPUT_DIR + 'PassengerLoggingAgent', -- :native_support -+ AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' - ] - - dependencies = [ -@@ -51,18 +48,7 @@ - LIBCOMMON, - ] - file AGENT_OUTPUT_DIR + 'nginx/PassengerHelperAgent' => dependencies do -- output_dir = "#{AGENT_OUTPUT_DIR}nginx" -- sh "mkdir -p #{output_dir}" if !File.directory?(output_dir) -- create_executable "#{output_dir}/PassengerHelperAgent", -- 'ext/nginx/HelperAgent.cpp', -- "-Iext -Iext/common " << -- "#{PlatformInfo.portability_cflags} " << -- "#{EXTRA_CXXFLAGS} " << -- "#{LIBCOMMON} " << -- "#{LIBBOOST_OXT} " << -- "#{PlatformInfo.portability_ldflags} " << -- "#{AGENT_LDFLAGS} " << -- "#{EXTRA_LDFLAGS}" -+ true - end +- AGENT_OUTPUT_DIR + 'SpawnPreparer', + COMMON_LIBRARY.only(*NGINX_LIBS_SELECTOR).link_objects + ].flatten - task :clean => 'nginx:clean' |