NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pcre: always enable the 8-bits version

Browse Source 
Commit 7154798a46 (pcre: add support for 16 bits and 32 bits
variants), added in preparation to the introduction of the Qt5
packages, could break other packages that use pcre.

Even though by default the pcre 8 bits library is selected if no other
variant is selected, a randpackageconfig, or an user, could
potentially enable the 16 bits variant even if a package requires the
8 bits variant.

This has caused a number of build breakage on packages like ngrep,
cegui, nmap and others in the autobuilders.

In older to solve this, we simply unconditionally build the 8-bits
variant. Since each variant is only ~90k in size, it's probably not
worth the effort giving the possibility of building the 16 bits
variant only.

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-09 04:40:35 +00:00 committed by Peter Korsgaard
parent 8d3f97257f
commit eaf4239420
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/pcre/Config.in
View File

@ -1,20 +1,14 @@
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
Perl Compatible Regular Expressions. By default, only the
8-bits libpcre is built. To get the 16-bits and/or 32-bits
variants libpcre16/libpcre32, use the package sub-options.
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

2
package/pcre/pcre.mk
View File

@ -16,7 +16,7 @@ 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 += --enable-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)