nginx: improve libexslt optional patch

Improve libexslt optional patch to silent confusing output. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
openwrt · Nov 4, 2024 · c17068d · c17068d
1 parent b89fdad
commit c17068d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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>"