summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-25 20:41:22 +0200
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2017-07-25 23:58:44 +0200
commit26b22b85a4bb6608a0fab5dd319d96c86fe7ea76 (patch)
treec2318e04775187579c886d10824e89b0ff75dcab /fs
parent8f3f28102dc4df0ff8882df601e8534aa4ab4d35 (diff)
downloadbuildroot-26b22b85a4bb6608a0fab5dd319d96c86fe7ea76.tar.gz
buildroot-26b22b85a4bb6608a0fab5dd319d96c86fe7ea76.zip
cppcms: fix build with ICU enabled, but CPPCMS_ICU disabled
When the ICU package is enabled (BR2_PACKAGE_ICU=y) but ICU support in cppcms is disabled (BR2_PACKAGE_CPPCMS_ICU is disabled), cppcms still detects ICU, but it fails to build since we don't get the proper ICU CXXFLAGS. In addition, this is not the intended behavior: when BR2_PACKAGE_CPPCMS_ICU is disabled, we expect cppcms to be built without ICU support. To achieve this, we pass -DDISABLE_ICU_LOCALE=ON when BR2_PACKAGE_CPPCMS_ICU is disabled (yes DISABLE_ICU_LOCALE means the logic is inverted). While at it, we pass DISABLE_ICU_LOCALE=OFF when ICU support is enabled, and not DISABLE_ICONV=ON. The latter has been passed in this condition since the cppcms package was introduced in Buildroot, but it doesn't seem to make sense. Fixes: http://autobuild.buildroot.net/results/b6a8c7000c5742efc9d8e13507dab86e36b62840/ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud