diff options
| author | James Aitken | 2012-04-07 01:14:47 +0100 |
|---|---|---|
| committer | Jack Nagel | 2012-04-07 13:15:22 -0500 |
| commit | b84845cd703fea9b2b87577be9c101a0e1fd810c (patch) | |
| tree | 8dacbd706ef6d0278bd27b670df2a7d1594ce728 /Library/Formula | |
| parent | cea872d294da6efd138c47f3da1cb8886b8ab768 (diff) | |
| download | homebrew-b84845cd703fea9b2b87577be9c101a0e1fd810c.tar.bz2 | |
Ngninx: correctly use homebrew installed version of PCRE
Fixes homebrew issue #11494 which was introduced in nginx 1.1.14.
Closes #11506.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/nginx.rb | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb index bab98a1b0..5bec138e6 100644 --- a/Library/Formula/nginx.rb +++ b/Library/Formula/nginx.rb @@ -15,7 +15,6 @@ class Nginx < Formula skip_clean 'logs' # Changes default port to 8080 - # Tell configure to look for pcre in HOMEBREW_PREFIX def patches DATA end @@ -44,6 +43,8 @@ class Nginx < Formula args = ["--prefix=#{prefix}", "--with-http_ssl_module", "--with-pcre", + "--with-cc-opt='-I#{HOMEBREW_PREFIX}/include'", + "--with-ld-opt='-L#{HOMEBREW_PREFIX}/lib'", "--conf-path=#{etc}/nginx/nginx.conf", "--pid-path=#{var}/run/nginx.pid", "--lock-path=#{var}/nginx/nginx.lock"] @@ -107,30 +108,6 @@ class Nginx < Formula end __END__ ---- a/auto/lib/pcre/conf -+++ b/auto/lib/pcre/conf -@@ -155,6 +155,21 @@ else - . auto/feature - fi - -+ if [ $ngx_found = no ]; then -+ -+ # Homebrew -+ ngx_feature="PCRE library in HOMEBREW_PREFIX" -+ ngx_feature_path="HOMEBREW_PREFIX/include" -+ -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-RHOMEBREW_PREFIX/lib -LHOMEBREW_PREFIX/lib -lpcre" -+ else -+ ngx_feature_libs="-LHOMEBREW_PREFIX/lib -lpcre" -+ fi -+ -+ . auto/feature -+ fi -+ - if [ $ngx_found = yes ]; then - CORE_DEPS="$CORE_DEPS $REGEX_DEPS" - CORE_SRCS="$CORE_SRCS $REGEX_SRCS" --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -33,7 +33,7 @@ |