| Message ID | 20211215223905.1844641-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/tvheadend: add optional support for pcre2 | expand |
On 15/12/2021 23:39, Bernd Kuhls wrote: > pcre2 takes precedence of pcre: > https://github.com/tvheadend/tvheadend/blob/master/configure#L473 > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Applied to master, thanks. Regards, Arnout > --- > package/tvheadend/tvheadend.mk | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk > index 27443307da..4e84e496bf 100644 > --- a/package/tvheadend/tvheadend.mk > +++ b/package/tvheadend/tvheadend.mk > @@ -121,11 +121,14 @@ TVHEADEND_DEPENDENCIES += liburiparser > TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE) > 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_CONF_OPTS += --enable-pcre > +TVHEADEND_CONF_OPTS += --enable-pcre --disable-pcre2 > else > -TVHEADEND_CONF_OPTS += --disable-pcre > +TVHEADEND_CONF_OPTS += --disable-pcre --disable-pcre2 > endif > > ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) >
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 27443307da..4e84e496bf 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -121,11 +121,14 @@ TVHEADEND_DEPENDENCIES += liburiparser TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE) 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_CONF_OPTS += --enable-pcre +TVHEADEND_CONF_OPTS += --enable-pcre --disable-pcre2 else -TVHEADEND_CONF_OPTS += --disable-pcre +TVHEADEND_CONF_OPTS += --disable-pcre --disable-pcre2 endif ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
pcre2 takes precedence of pcre: https://github.com/tvheadend/tvheadend/blob/master/configure#L473 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/tvheadend/tvheadend.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)