From: Christian Marangi <redacted>
Date: Sun, 3 Nov 2024 15:59:00 +0000 (+0100)
Subject: nginx: improve libexslt optional patch
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b5183a38371ff06eae540f2bb68f802cde61887c;p=openwrt-packages.git

nginx: improve libexslt optional patch

Improve libexslt optional patch to silent confusing output.

Signed-off-by: Christian Marangi <redacted>
---

diff --git a/net/nginx/patches/nginx/105-optional-libexslt.patch b/net/nginx/patches/nginx/105-optional-libexslt.patch
index 9ae629cad..6c590fb7b 100644
--- a/net/nginx/patches/nginx/105-optional-libexslt.patch
+++ b/net/nginx/patches/nginx/105-optional-libexslt.patch
@@ -18,12 +18,17 @@
          --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
+@@ -96,6 +96,8 @@ END
  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
++if [ $USE_LIBEXSLT = YES ]; then
++
+     ngx_feature="libexslt"
+     ngx_feature_name=NGX_HAVE_EXSLT
+     ngx_feature_run=no
+@@ -163,3 +165,4 @@ if [ $ngx_found = yes ]; then
+ 
+     NGX_LIB_LIBXSLT="$NGX_LIB_LIBXSLT -lexslt"
+ fi
++fi
diff --git a/net/nginx/patches/nginx/106-libxslt-fix-detection.patch b/net/nginx/patches/nginx/106-libxslt-fix-detection.patch
index fba35b977..76513bc13 100644
--- a/net/nginx/patches/nginx/106-libxslt-fix-detection.patch
+++ b/net/nginx/patches/nginx/106-libxslt-fix-detection.patch
@@ -9,7 +9,7 @@
      ngx_feature_libs="-lxml2 -lxslt"
      ngx_feature_test="xmlParserCtxtPtr    ctxt = NULL;
                        xsltStylesheetPtr   sheet = NULL;
-@@ -100,7 +100,7 @@ fi
+@@ -102,7 +102,7 @@ if [ $USE_LIBEXSLT = YES ]; then
      ngx_feature_name=NGX_HAVE_EXSLT
      ngx_feature_run=no
      ngx_feature_incs="#include <libexslt/exslt.h>"