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 <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2013-03-06 10:22:43 +00:00 committed by Peter Korsgaard
parent a9ba807c58
commit 7154798a46
2 changed files with 26 additions and 0 deletions

View File

@ -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

View File

@ -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))