details: https://hg.nginx.org/nginx/rev/398495d816f0
branches:
changeset: 9233:398495d816f0
user: Piotr Sikora <piotr@aviatrix.com>
date: Mon Feb 26 20:00:43 2024 +0000
description:
Configure: added support for Homebrew on Apple Silicon.

Signed-off-by: Piotr Sikora <piotr@aviatrix.com>

diffstat:

auto/lib/geoip/conf | 17 +++++++++++++++++
auto/lib/google-perftools/conf | 16 ++++++++++++++++
auto/lib/libgd/conf | 17 +++++++++++++++++
auto/lib/openssl/conf | 18 ++++++++++++++++++
auto/lib/pcre/conf | 16 ++++++++++++++++
5 files changed, 84 insertions(+), 0 deletions(-)

diffs (134 lines):

diff -r 427aa785edf8 -r 398495d816f0 auto/lib/geoip/conf
--- a/auto/lib/geoip/conf Wed Mar 27 19:36:51 2024 +0400
+++ b/auto/lib/geoip/conf Mon Feb 26 20:00:43 2024 +0000
@@ -64,6 +64,23 @@ if [ $ngx_found = no ]; then
fi


+if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="GeoIP library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lGeoIP"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lGeoIP"
+ fi
+
+ . auto/feature
+fi
+
+
if [ $ngx_found = yes ]; then

CORE_INCS="$CORE_INCS $ngx_feature_path"
diff -r 427aa785edf8 -r 398495d816f0 auto/lib/google-perftools/conf
--- a/auto/lib/google-perftools/conf Wed Mar 27 19:36:51 2024 +0400
+++ b/auto/lib/google-perftools/conf Mon Feb 26 20:00:43 2024 +0000
@@ -46,6 +46,22 @@ if [ $ngx_found = no ]; then
fi


+if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="Google perftools in /opt/homebrew/"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lprofiler"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lprofiler"
+ fi
+
+ . auto/feature
+fi
+
+
if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"

diff -r 427aa785edf8 -r 398495d816f0 auto/lib/libgd/conf
--- a/auto/lib/libgd/conf Wed Mar 27 19:36:51 2024 +0400
+++ b/auto/lib/libgd/conf Mon Feb 26 20:00:43 2024 +0000
@@ -65,6 +65,23 @@ if [ $ngx_found = no ]; then
fi


+if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="GD library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lgd"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lgd"
+ fi
+
+ . auto/feature
+fi
+
+
if [ $ngx_found = yes ]; then

CORE_INCS="$CORE_INCS $ngx_feature_path"
diff -r 427aa785edf8 -r 398495d816f0 auto/lib/openssl/conf
--- a/auto/lib/openssl/conf Wed Mar 27 19:36:51 2024 +0400
+++ b/auto/lib/openssl/conf Mon Feb 26 20:00:43 2024 +0000
@@ -122,6 +122,24 @@ else
. auto/feature
fi

+ if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="OpenSSL library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lssl -lcrypto"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lssl -lcrypto"
+ fi
+
+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
+
+ . auto/feature
+ fi
+
if [ $ngx_found = yes ]; then
have=NGX_SSL . auto/have
CORE_INCS="$CORE_INCS $ngx_feature_path"
diff -r 427aa785edf8 -r 398495d816f0 auto/lib/pcre/conf
--- a/auto/lib/pcre/conf Wed Mar 27 19:36:51 2024 +0400
+++ b/auto/lib/pcre/conf Mon Feb 26 20:00:43 2024 +0000
@@ -182,6 +182,22 @@ else
. auto/feature
fi

+ if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="PCRE library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lpcre"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lpcre"
+ fi
+
+ . auto/feature
+ fi
+
if [ $ngx_found = yes ]; then
CORE_INCS="$CORE_INCS $ngx_feature_path"
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
https://mailman.nginx.org/mailman/listinfo/nginx-devel