[Buildroot] [PATCH 1/1] package/lighttpd: switch to pcre2

[Buildroot] [PATCH 1/1] package/lighttpd: switch to pcre2

[Fabrice Fontaine]

Switch to pcre2 which is supported since version 1.4.62 and
https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b
and enabled by default since version 1.4.64 and
https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/lighttpd/Config.in   | 2 +-
 package/lighttpd/lighttpd.mk | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
index 9f593a9228..ed674a9227 100644
--- a/package/lighttpd/Config.in
+++ b/package/lighttpd/Config.in
@@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2
 
 config BR2_PACKAGE_LIGHTTPD_PCRE
 	bool "pcre support"
-	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_PCRE2
 	help
 	  Enable PCRE support. Needed to support mod_rewrite
 
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index f0974dd5b2..2a05071209 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \
 	-Dwith_mysql=false \
 	-Dwith_nettle=false \
 	-Dwith_nss=false \
+	-Dwith_pcre=false \
 	-Dwith_pgsql=false \
 	-Dwith_sasl=false \
 	-Dwith_wolfssl=false \
@@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y)
-LIGHTTPD_DEPENDENCIES += pcre
-LIGHTTPD_CONF_OPTS += -Dwith_pcre=true
+LIGHTTPD_DEPENDENCIES += pcre2
+LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true
 else
-LIGHTTPD_CONF_OPTS += -Dwith_pcre=false
+LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y)
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/lighttpd: switch to pcre2

[Yann E. MORIN]

Fabrice, All,

On 2022-01-22 23:44 +0100, Fabrice Fontaine spake thusly:
> Switch to pcre2 which is supported since version 1.4.62 and
> https://github.com/lighttpd/lighttpd1.4/commit/7512d82ca49f1b579819c2974c61de4e3137c70b
> and enabled by default since version 1.4.64 and
> https://github.com/lighttpd/lighttpd1.4/commit/750414d3bb6f13c119220e56d0c8123e665dffc5
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/lighttpd/Config.in   | 2 +-
>  package/lighttpd/lighttpd.mk | 7 ++++---
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/package/lighttpd/Config.in b/package/lighttpd/Config.in
> index 9f593a9228..ed674a9227 100644
> --- a/package/lighttpd/Config.in
> +++ b/package/lighttpd/Config.in
> @@ -48,7 +48,7 @@ config BR2_PACKAGE_LIGHTTPD_BZIP2
>  
>  config BR2_PACKAGE_LIGHTTPD_PCRE
>  	bool "pcre support"
> -	select BR2_PACKAGE_PCRE
> +	select BR2_PACKAGE_PCRE2
>  	help
>  	  Enable PCRE support. Needed to support mod_rewrite
>  
> diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
> index f0974dd5b2..2a05071209 100644
> --- a/package/lighttpd/lighttpd.mk
> +++ b/package/lighttpd/lighttpd.mk
> @@ -26,6 +26,7 @@ LIGHTTPD_CONF_OPTS = \
>  	-Dwith_mysql=false \
>  	-Dwith_nettle=false \
>  	-Dwith_nss=false \
> +	-Dwith_pcre=false \
>  	-Dwith_pgsql=false \
>  	-Dwith_sasl=false \
>  	-Dwith_wolfssl=false \
> @@ -65,10 +66,10 @@ LIGHTTPD_CONF_OPTS += -Dwith_bzip=false
>  endif
>  
>  ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y)
> -LIGHTTPD_DEPENDENCIES += pcre
> -LIGHTTPD_CONF_OPTS += -Dwith_pcre=true
> +LIGHTTPD_DEPENDENCIES += pcre2
> +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=true
>  else
> -LIGHTTPD_CONF_OPTS += -Dwith_pcre=false
> +LIGHTTPD_CONF_OPTS += -Dwith_pcre2=false
>  endif
>  
>  ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y)
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot