[Buildroot] [git commit] package/tvheadend: add optional support for pcre2
From: Arnout Vandecappelle (Essensium/Mind) <hidden>
Date: 2021-12-16 20:16:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Arnout Vandecappelle (Essensium/Mind) <hidden>
Date: 2021-12-16 20:16:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=60d416fb6cace17627eb2f1009c9ffe6f0f033ad branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master pcre2 takes precedence of pcre: https://github.com/tvheadend/tvheadend/blob/master/configure#L473 Signed-off-by: Bernd Kuhls <redacted> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <redacted> --- 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),)
_______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot