From 159b6f09f067020a365aa366a4301dae2e113bee Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Thu, 3 Oct 2024 23:33:34 +0200 Subject: [PATCH] nginx: add patch to make libexslt optional Add patch to make libexslt library optional as nginx autoenable it if detected. Signed-off-by: Christian Marangi --- .../patches/nginx/105-optional-libexslt.patch | 29 +++++++++++++++++++ .../nginx/201-ignore-invalid-options.patch | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 net/nginx/patches/nginx/105-optional-libexslt.patch diff --git a/net/nginx/patches/nginx/105-optional-libexslt.patch b/net/nginx/patches/nginx/105-optional-libexslt.patch new file mode 100644 index 0000000000..9ae629cad5 --- /dev/null +++ b/net/nginx/patches/nginx/105-optional-libexslt.patch @@ -0,0 +1,29 @@ +--- a/auto/options ++++ b/auto/options +@@ -165,6 +165,7 @@ USE_PERL=NO + NGX_PERL=perl + + USE_LIBXSLT=NO ++USE_LIBEXSLT=NO + USE_LIBGD=NO + USE_GEOIP=NO + +@@ -370,6 +371,7 @@ use the \"--with-mail_ssl_module\" optio + --with-pcre-opt=*) PCRE_OPT="$value" ;; + --with-pcre-jit) PCRE_JIT=YES ;; + --without-pcre2) PCRE2=DISABLED ;; ++ --with-libexslt) USE_LIBEXSLT=YES ;; + + --with-openssl=*) OPENSSL="$value" ;; + --with-openssl-opt=*) OPENSSL_OPT="$value" ;; +--- a/auto/lib/libxslt/conf ++++ b/auto/lib/libxslt/conf +@@ -156,7 +156,7 @@ if [ $ngx_found = no ]; then + fi + + +-if [ $ngx_found = yes ]; then ++if [ $ngx_found = yes ] && [ $USE_LIBEXSLT = "YES" ]; then + if [ $USE_LIBXSLT = YES ]; then + CORE_LIBS="$CORE_LIBS -lexslt" + fi diff --git a/net/nginx/patches/nginx/201-ignore-invalid-options.patch b/net/nginx/patches/nginx/201-ignore-invalid-options.patch index 8556ce5bf8..37de67dd21 100644 --- a/net/nginx/patches/nginx/201-ignore-invalid-options.patch +++ b/net/nginx/patches/nginx/201-ignore-invalid-options.patch @@ -1,6 +1,6 @@ --- a/auto/options +++ b/auto/options -@@ -413,8 +413,7 @@ $0: warning: the \"--with-sha1-asm\" opt +@@ -415,8 +415,7 @@ $0: warning: the \"--with-sha1-asm\" opt --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; *) -- 2.30.2