mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-13 17:39:57 +00:00
nginx: add configure option
Support --with-http_xslt_module configure option via a PACKAGECONFIG
option. The option is not added to the defaults.
Cherry-pick from master.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e0ac8eec48)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
@@ -0,0 +1,39 @@
|
|||||||
|
From 0c3c669464a514cf8d0cac08282ecb2b486f440f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Joe Slater <joe.slater@windriver.com>
|
||||||
|
Date: Tue, 3 Oct 2023 19:21:17 +0000
|
||||||
|
Subject: [PATCH] configure: libxslt conf
|
||||||
|
|
||||||
|
Modify to find libxslt related include files under sysroot.
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||||
|
---
|
||||||
|
auto/lib/libxslt/conf | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
|
||||||
|
index 3063ac7..eb77886 100644
|
||||||
|
--- a/auto/lib/libxslt/conf
|
||||||
|
+++ b/auto/lib/libxslt/conf
|
||||||
|
@@ -12,7 +12,7 @@
|
||||||
|
#include <libxslt/xsltInternals.h>
|
||||||
|
#include <libxslt/transform.h>
|
||||||
|
#include <libxslt/xsltutils.h>"
|
||||||
|
- ngx_feature_path="/usr/include/libxml2"
|
||||||
|
+ ngx_feature_path="=/usr/include/libxml2"
|
||||||
|
ngx_feature_libs="-lxml2 -lxslt"
|
||||||
|
ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
|
||||||
|
xsltStylesheetPtr sheet = NULL;
|
||||||
|
@@ -100,7 +100,7 @@ fi
|
||||||
|
ngx_feature_name=NGX_HAVE_EXSLT
|
||||||
|
ngx_feature_run=no
|
||||||
|
ngx_feature_incs="#include <libexslt/exslt.h>"
|
||||||
|
- ngx_feature_path="/usr/include/libxml2"
|
||||||
|
+ ngx_feature_path="=/usr/include/libxml2"
|
||||||
|
ngx_feature_libs="-lexslt"
|
||||||
|
ngx_feature_test="exsltRegisterAll();"
|
||||||
|
. auto/feature
|
||||||
|
--
|
||||||
|
2.35.5
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ SRC_URI = " \
|
|||||||
file://nginx-volatile.conf \
|
file://nginx-volatile.conf \
|
||||||
file://nginx.service \
|
file://nginx.service \
|
||||||
file://nginx-fix-pidfile.patch \
|
file://nginx-fix-pidfile.patch \
|
||||||
|
file://0001-configure-libxslt-conf.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
inherit siteinfo update-rc.d useradd systemd
|
inherit siteinfo update-rc.d useradd systemd
|
||||||
@@ -46,6 +47,8 @@ PACKAGECONFIG[http-auth-request] = "--with-http_auth_request_module,,"
|
|||||||
PACKAGECONFIG[ipv6] = "--with-ipv6,,"
|
PACKAGECONFIG[ipv6] = "--with-ipv6,,"
|
||||||
PACKAGECONFIG[webdav] = "--with-http_dav_module,,"
|
PACKAGECONFIG[webdav] = "--with-http_dav_module,,"
|
||||||
|
|
||||||
|
PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt"
|
||||||
|
|
||||||
do_configure () {
|
do_configure () {
|
||||||
if [ "${SITEINFO_BITS}" = "64" ]; then
|
if [ "${SITEINFO_BITS}" = "64" ]; then
|
||||||
PTRSIZE=8
|
PTRSIZE=8
|
||||||
|
|||||||
Reference in New Issue
Block a user