From 951f800266877865b77a43beadcdbae3e05de918 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 15:10:15 +0100 Subject: do not accidently link with libcharset, when NO_ICONV is set --- package/git/patches/patch-configure_ac | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 package/git/patches/patch-configure_ac (limited to 'package/git/patches') diff --git a/package/git/patches/patch-configure_ac b/package/git/patches/patch-configure_ac new file mode 100644 index 000000000..3aa0a15b5 --- /dev/null +++ b/package/git/patches/patch-configure_ac @@ -0,0 +1,15 @@ +--- git-1.8.4.2.orig/configure.ac 2013-10-28 19:17:38.000000000 +0100 ++++ git-1.8.4.2/configure.ac 2013-10-29 15:05:57.000000000 +0100 +@@ -876,10 +876,12 @@ AC_CHECK_HEADER([paths.h], + GIT_CONF_SUBST([HAVE_PATHS_H]) + # + # Define HAVE_LIBCHARSET_H if have libcharset.h ++if test -z "$NO_ICONV"; then + AC_CHECK_HEADER([libcharset.h], + [HAVE_LIBCHARSET_H=YesPlease], + [HAVE_LIBCHARSET_H=]) + GIT_CONF_SUBST([HAVE_LIBCHARSET_H]) ++fi + # + # Define HAVE_STRINGS_H if you have strings.h + AC_CHECK_HEADER([strings.h], -- cgit v1.2.3