nginx: improve libexslt optional patch 25192/head
authorChristian Marangi <ansuelsmth@gmail.com>
Sun, 3 Nov 2024 15:59:00 +0000 (16:59 +0100)
committerChristian Marangi <ansuelsmth@gmail.com>
Mon, 4 Nov 2024 10:42:55 +0000 (11:42 +0100)
Improve libexslt optional patch to silent confusing output.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
net/nginx/patches/nginx/105-optional-libexslt.patch
net/nginx/patches/nginx/106-libxslt-fix-detection.patch

index 9ae629cad5f0495339981cf5252e6c98ecb633b6..6c590fb7b89876233aed197130a741772020296c 100644 (file)
          --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
index fba35b977d88d03cc58d80f5a19e323e46281d32..76513bc13e44f1eeb5012fa3fb0ce753e39a142c 100644 (file)
@@ -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>"