openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 21:24:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

nginx: improve libexslt optional patch

Browse Source 
Improve libexslt optional patch to silent confusing output.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2024-11-03 16:59:00 +01:00
parent c919fddfc1
commit b5183a3837
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
net/nginx/patches/nginx/105-optional-libexslt.patch
View File

@@ -18,12 +18,17 @@
--with-openssl-opt=*) OPENSSL_OPT="$value" ;; --with-openssl-opt=*) OPENSSL_OPT="$value" ;;
--- a/auto/lib/libxslt/conf --- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf +++ b/auto/lib/libxslt/conf
@@ -156,7 +156,7 @@ if [ $ngx_found = no ]; then @@ -96,6 +96,8 @@ END
fi fi
-if [ $ngx_found = yes ]; then +if [ $USE_LIBEXSLT = YES ]; then
+if [ $ngx_found = yes ] && [ $USE_LIBEXSLT = "YES" ]; then +
if [ $USE_LIBXSLT = YES ]; then ngx_feature="libexslt"
CORE_LIBS="$CORE_LIBS -lexslt" ngx_feature_name=NGX_HAVE_EXSLT
fi ngx_feature_run=no
@@ -163,3 +165,4 @@ if [ $ngx_found = yes ]; then
NGX_LIB_LIBXSLT="$NGX_LIB_LIBXSLT -lexslt"
fi
+fi

2
net/nginx/patches/nginx/106-libxslt-fix-detection.patch
View File

@@ -9,7 +9,7 @@
ngx_feature_libs="-lxml2 -lxslt" ngx_feature_libs="-lxml2 -lxslt"
ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
xsltStylesheetPtr sheet = 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_name=NGX_HAVE_EXSLT
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs="#include <libexslt/exslt.h>" ngx_feature_incs="#include <libexslt/exslt.h>"