From 7154798a461a8b2c2882fa2c1ce2c58b0d8d6614 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 6 Mar 2013 10:22:43 +0000 Subject: pcre: add support for 16 bits and 32 bits variants Until now, we have been building only the 8bits PCRE variant. However, Qt5 requires the 16bits variant. This commit therefore adds support to build the 16bits and 32bits variants of PCRE. In order to preserve backward compatibility, the 8bits variant is automatically chosen if no specific variant is defined. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/pcre/Config.in | 22 ++++++++++++++++++++++ package/pcre/pcre.mk | 4 ++++ 2 files changed, 26 insertions(+) diff --git a/package/pcre/Config.in b/package/pcre/Config.in index a4e2547ce..5d16e6d1b 100644 --- a/package/pcre/Config.in +++ b/package/pcre/Config.in @@ -1,6 +1,28 @@ config BR2_PACKAGE_PCRE bool "pcre" + # Ensure at least the default 8-bit library is enabled. + select BR2_PACKAGE_PCRE_8 if \ + (!BR2_PACKAGE_PCRE_16 && !BR2_PACKAGE_PCRE_32) help Perl Compatible Regular Expressions http://www.pcre.org/ + +if BR2_PACKAGE_PCRE + +config BR2_PACKAGE_PCRE_8 + bool "8-bit pcre" + help + This option builds the 8-bits pcre library, i.e 'libpcre' + +config BR2_PACKAGE_PCRE_16 + bool "16-bit pcre" + help + This option builds the 16-bits pcre library, i.e 'libpcre16' + +config BR2_PACKAGE_PCRE_32 + bool "32-bit pcre" + help + This option builds the 32-bits pcre library, i.e 'libpcre32' + +endif diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index 48266ff74..b1339fbbc 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -16,4 +16,8 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y) PCRE_CONF_OPT = --disable-cpp endif +PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_8),--enable-pcre8,--disable-pcre8) +PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16) +PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32) + $(eval $(autotools-package)) -- cgit v1.2.3