git: needs libiconv on toolchains without locale support

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2013-06-03 22:52:24 +02:00
parent f7dbc3a500
commit 34dae9ac28
2 changed files with 3 additions and 1 deletions

View File

@ -2,6 +2,7 @@ config BR2_PACKAGE_GIT
bool "git"
depends on BR2_LARGEFILE
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Git is a free and open source distributed version control system
designed to handle everything from small to very large projects.

View File

@ -40,6 +40,7 @@ endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
GIT_DEPENDENCIES += libiconv
GIT_CONF_ENV += LIBS=-liconv
GIT_CONF_OPT += --with-iconv=/usr/lib
else
GIT_CONF_OPT += --without-iconv
@ -54,7 +55,7 @@ endif
# assume yes for these tests, configure will bail out otherwise
# saying error: cannot run test program while cross compiling
GIT_CONF_ENV = ac_cv_fread_reads_directories=yes \
GIT_CONF_ENV += ac_cv_fread_reads_directories=yes \
ac_cv_snprintf_returns_bogus=yes
$(eval $(autotools-package))