From eaf42394208b2cbcb73f374e39ddb4ee7b8aee60 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 9 Mar 2013 04:40:35 +0000 Subject: pcre: always enable the 8-bits version Commit 7154798a461a8b2c (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 Signed-off-by: Peter Korsgaard --- package/pcre/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pcre/pcre.mk') 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) -- cgit v1.2.3