updated the dtrace patch for the linking issue on FreeBSD.

2012-08-14 14:45:49 -07:00 · 2012-08-14 14:45:49 -07:00 · 2584e135ed
parent 9e49dee28a
commit 2584e135ed
1 changed files with 13 additions and 0 deletions
--- a/patches/nginx-1.2.1-dtrace.patch
+++ b/patches/nginx-1.2.1-dtrace.patch
@ -260,6 +260,19 @@ index 393be40..05609c6 100644
 
 if [ ".$NGX_ERROR_LOG_PATH" = ".stderr" ]; then
     NGX_ERROR_LOG_PATH=
+diff --git a/auto/os/freebsd b/auto/os/freebsd
+index 6aa823f..ee15166 100644
+--- a/auto/os/freebsd
+++ b/auto/os/freebsd
+@@ -142,3 +142,8 @@ if [ $version -ge 701000 ]; then
+     echo " + cpuset_setaffinity() found"
+     have=NGX_HAVE_CPUSET_SETAFFINITY . auto/have
+ fi
+
+if [ $NGX_DTRACE = YES ]; then
+    NGX_LD_OPT="$NGX_LD_OPT -lelf"
+fi
+
 diff --git a/auto/sources b/auto/sources
 index 374ad66..72bb1b0 100644
 --- a/auto/sources