diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-30 10:21:40 +0200 |
| commit | 074b6689e81d5bc4abf08d63dc8086b9cc41a078 (patch) | |
| tree | 8cff99d679b7260a54cebac38af0764b16394b71 /package/libiconv | |
| parent | 18abd4aa94cd59240b90257c95877c0ea2fd1796 (diff) | |
| parent | e7584697f24d0bc6fc660703d97a38598cb76690 (diff) | |
| download | buildroot-novena-074b6689e81d5bc4abf08d63dc8086b9cc41a078.tar.gz buildroot-novena-074b6689e81d5bc4abf08d63dc8086b9cc41a078.zip | |
Merge branch 'fixes-20100729' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/libiconv')
| -rw-r--r-- | package/libiconv/libiconv.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk index cc40cd4b6..a3f762ab6 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 |