From cd4b55dca0f9fe32e82c412ae6cb9976b864f3d0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 9 May 2022 22:46:36 -0600 Subject: [PATCH] package/git: fix build with iconv Our libiconv shouldn't need the ICONV_OMITS_BOM workaround. We also need to correctly set the iconv path so that we don't use the host iconv path. Fixes: - http://autobuild.buildroot.net/results/027/027602a750fd0989f9861773a2c4672667590acc Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/git/git.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/git/git.mk b/package/git/git.mk index 0127ba5129..981a238acb 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -49,7 +49,8 @@ endif ifeq ($(BR2_PACKAGE_LIBICONV),y) GIT_DEPENDENCIES += libiconv GIT_CONF_ENV_LIBS += -liconv -GIT_CONF_OPTS += --with-iconv=/usr/lib +GIT_CONF_OPTS += --with-iconv=$(STAGING_DIR)/usr +GIT_CONF_ENV += ac_cv_iconv_omits_bom=no else GIT_CONF_OPTS += --without-iconv endif