Explorar o código

package/tvheadend: add optional support for pcre2

pcre2 takes precedence of pcre:
https://github.com/tvheadend/tvheadend/blob/master/configure#L473

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Bernd Kuhls %!s(int64=3) %!d(string=hai) anos
pai
achega
60d416fb6c
Modificáronse 1 ficheiros con 6 adicións e 3 borrados
  1. 6 3
      package/tvheadend/tvheadend.mk

+ 6 - 3
package/tvheadend/tvheadend.mk

@@ -121,11 +121,14 @@ TVHEADEND_DEPENDENCIES += liburiparser
 TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
 TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
 endif
 endif
 
 
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+TVHEADEND_DEPENDENCIES += pcre2
+TVHEADEND_CONF_OPTS += --disable-pcre --enable-pcre2
+else ifeq ($(BR2_PACKAGE_PCRE),y)
 TVHEADEND_DEPENDENCIES += pcre
 TVHEADEND_DEPENDENCIES += pcre
-TVHEADEND_CONF_OPTS += --enable-pcre
+TVHEADEND_CONF_OPTS += --enable-pcre --disable-pcre2
 else
 else
-TVHEADEND_CONF_OPTS += --disable-pcre
+TVHEADEND_CONF_OPTS += --disable-pcre --disable-pcre2
 endif
 endif
 
 
 ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
 ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)