aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/git/Config.in1
-rw-r--r--package/git/git.mk3
2 files changed, 3 insertions, 1 deletions
diff --git a/package/git/Config.in b/package/git/Config.in
index dc342aa7bb..931d460d4f 100644
--- a/package/git/Config.in
+++ b/package/git/Config.in
@@ -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.
diff --git a/package/git/git.mk b/package/git/git.mk
index 6bc9761493..7e2f114be0 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -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))