diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2023-09-22 14:45:55 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-09-22 14:55:02 +0200 |
| commit | f0754531c4d85ac301c95d7dc6c83acdad6b24e7 (patch) | |
| tree | 8a7c7bfa23931b36597d88ef93412a129d6b79e6 /net/nginx/Makefile | |
| parent | 6bba36078e8a440d84c47eb9cb0e26fea3b4b281 (diff) | |
nginx: move to PCRE2
Move nginx to PCRE2 now that lua modules supports it.
nginx ebaled PCRE2 by default so we simply revert the config to revert
it.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'net/nginx/Makefile')
| -rw-r--r-- | net/nginx/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/nginx/Makefile b/net/nginx/Makefile index ee223668c..7601c442a 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -113,7 +113,7 @@ define Package/nginx-ssl $(Package/nginx/default) TITLE += with SSL support VARIANT:=ssl - DEPENDS+= +NGINX_PCRE:libpcre \ + DEPENDS+= +NGINX_PCRE:libpcre2 \ +NGINX_PCRE:nginx-ssl-util +!NGINX_PCRE:nginx-ssl-util-nopcre \ +NGINX_HTTP_GZIP:zlib +NGINX_DAV:libxml2 EXTRA_DEPENDS:=nginx-ssl-util$(if $(CONFIG_NGINX_PCRE),,-nopcre) (>=1.5-1) (<2) @@ -163,7 +163,7 @@ endef define Package/nginx-full $(Package/nginx/default) TITLE += with ALL config selected - DEPENDS+=+libpcre +nginx-ssl-util +zlib +libxml2 + DEPENDS+=+libpcre2 +nginx-ssl-util +zlib +libxml2 EXTRA_DEPENDS:=nginx-ssl-util (>=1.5-1) (<2) VARIANT:=full PROVIDES += nginx-ssl @@ -408,7 +408,6 @@ CONFIGURE_ARGS += \ --with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ --with-ld-opt="$(TARGET_LDFLAGS)" \ --without-http_upstream_zone_module \ - --without-pcre2 \ --with-compat \ --with-http_ssl_module \ $(if $(call IsDisabled,NGINX_HTTP_CACHE),--without-http-cache) \ |