From a302e3aaa0a7e4eec1a82143efbbd09629b499ea Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 29 Jul 2010 09:50:59 +0200 Subject: [PATCH] libiconv: add an error when both libiconv and locale are enabled This error should never show up if all Buildroot dependencies are correct. However, rather than failing horribly later on, catch this particular case early on and error out. Signed-off-by: Thomas Petazzoni --- package/libiconv/libiconv.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index cc40cd4b64..a3f762ab6f 100644 --- a/package/libiconv/libiconv.mk +++ b/package/libiconv/libiconv.mk @@ -23,3 +23,10 @@ ifneq ($(BR2_ENABLE_DEBUG),y) $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcharset.so.* endif touch $@ + +# Configurations where the toolchain supports locales and the libiconv +# package is enabled are incorrect, because the toolchain already +# provides libiconv functionality, and having both confuses packages. +ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_ENABLE_LOCALE),yy) +$(error Libiconv should never be enabled when the toolchain supports locales. Report this failure to Buildroot developers) +endif -- 2.30.2