diff options
author | Joe Slater <joe.slater@windriver.com> | 2023-10-04 09:13:45 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-10-04 13:10:06 -0700 |
commit | e0ac8eec48ddddc93751cfcdef2557998bfe91c8 (patch) | |
tree | a3f54ccb8fb39fa20953df93283b999a558028d5 /meta-webserver | |
parent | 883860c40c67544dfe3e2d72732e2d8ef46b6f30 (diff) | |
download | meta-openembedded-e0ac8eec48ddddc93751cfcdef2557998bfe91c8.tar.gz |
nginx: add configure option
Support --with-http_xslt_module configure option via a PACKAGECONFIG
option. The option is not added to the defaults.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r-- | meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch | 39 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/nginx/nginx.inc | 3 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch b/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch new file mode 100644 index 000000000..7ba2a1fb8 --- /dev/null +++ b/meta-webserver/recipes-httpd/nginx/files/0001-configure-libxslt-conf.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 0c3c669464a514cf8d0cac08282ecb2b486f440f Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <joe.slater@windriver.com> | ||
3 | Date: Tue, 3 Oct 2023 19:21:17 +0000 | ||
4 | Subject: [PATCH] configure: libxslt conf | ||
5 | |||
6 | Modify to find libxslt related include files under sysroot. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
11 | --- | ||
12 | auto/lib/libxslt/conf | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf | ||
16 | index 3063ac7..eb77886 100644 | ||
17 | --- a/auto/lib/libxslt/conf | ||
18 | +++ b/auto/lib/libxslt/conf | ||
19 | @@ -12,7 +12,7 @@ | ||
20 | #include <libxslt/xsltInternals.h> | ||
21 | #include <libxslt/transform.h> | ||
22 | #include <libxslt/xsltutils.h>" | ||
23 | - ngx_feature_path="/usr/include/libxml2" | ||
24 | + ngx_feature_path="=/usr/include/libxml2" | ||
25 | ngx_feature_libs="-lxml2 -lxslt" | ||
26 | ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; | ||
27 | xsltStylesheetPtr sheet = NULL; | ||
28 | @@ -100,7 +100,7 @@ fi | ||
29 | ngx_feature_name=NGX_HAVE_EXSLT | ||
30 | ngx_feature_run=no | ||
31 | ngx_feature_incs="#include <libexslt/exslt.h>" | ||
32 | - ngx_feature_path="/usr/include/libxml2" | ||
33 | + ngx_feature_path="=/usr/include/libxml2" | ||
34 | ngx_feature_libs="-lexslt" | ||
35 | ngx_feature_test="exsltRegisterAll();" | ||
36 | . auto/feature | ||
37 | -- | ||
38 | 2.35.5 | ||
39 | |||
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 1ea32f7c9..8890e0bea 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc | |||
@@ -22,6 +22,7 @@ SRC_URI = " \ | |||
22 | file://nginx-volatile.conf \ | 22 | file://nginx-volatile.conf \ |
23 | file://nginx.service \ | 23 | file://nginx.service \ |
24 | file://nginx-fix-pidfile.patch \ | 24 | file://nginx-fix-pidfile.patch \ |
25 | file://0001-configure-libxslt-conf.patch \ | ||
25 | " | 26 | " |
26 | 27 | ||
27 | inherit siteinfo update-rc.d useradd systemd | 28 | inherit siteinfo update-rc.d useradd systemd |
@@ -47,6 +48,8 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,," | |||
47 | PACKAGECONFIG[webdav] = "--with-http_dav_module,," | 48 | PACKAGECONFIG[webdav] = "--with-http_dav_module,," |
48 | PACKAGECONFIG[stream] = "--with-stream,," | 49 | PACKAGECONFIG[stream] = "--with-stream,," |
49 | 50 | ||
51 | PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt" | ||
52 | |||
50 | do_configure () { | 53 | do_configure () { |
51 | if [ "${SITEINFO_BITS}" = "64" ]; then | 54 | if [ "${SITEINFO_BITS}" = "64" ]; then |
52 | PTRSIZE=8 | 55 | PTRSIZE=8 |