diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/pcre/Config.in | 12 | ||||
| -rw-r--r-- | package/pcre/pcre.mk | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/package/pcre/Config.in b/package/pcre/Config.in index 5d16e6d1b..dc9227410 100644 --- a/package/pcre/Config.in +++ b/package/pcre/Config.in @@ -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 diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk index b1339fbbc..745309fa8 100644 --- a/package/pcre/pcre.mk +++ b/package/pcre/pcre.mk @@ -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) |