Selaa lähdekoodia

package/lighttpd: switch to pcre2

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>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Fabrice Fontaine 3 vuotta sitten
vanhempi
commit
694189ffa3
2 muutettua tiedostoa jossa 5 lisäystä ja 4 poistoa
  1. 1 1
      package/lighttpd/Config.in
  2. 4 3
      package/lighttpd/lighttpd.mk

+ 1 - 1
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
 

+ 4 - 3
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)