]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commit
cppcms: fix build with ICU enabled, but CPPCMS_ICU disabled
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 25 Jul 2017 18:41:22 +0000 (20:41 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tue, 25 Jul 2017 21:58:44 +0000 (23:58 +0200)
commit26b22b85a4bb6608a0fab5dd319d96c86fe7ea76
treec2318e04775187579c886d10824e89b0ff75dcab
parent8f3f28102dc4df0ff8882df601e8534aa4ab4d35
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>
package/cppcms/cppcms.mk