package/git: Fix build without libiconv
PATCH 1/2 package/git: Fix build without libiconv
Partly fixes
http://autobuild.buildroot.net/results/6be/6be94fe2542f3ac9fb785dd22f504e25c2a7802e/
This patch is also needed: http://patchwork.ozlabs.org/patch/715921/
Signed-off-by Bernd Kuhls <[email protected]>
--- .../0001-configure.ac-fix-old-iconv-check.patch | 42 ++++++++++++++++++ .../git/0002-configure.ac-Fix-without-iconv.patch | 51 ++++++++++++++++++++++ package/git/git.mk | 1 + 3 files changed, 94 insertions(+) create mode 100644 package/git/0001-configure.ac-fix-old-iconv-check.patch create mode 100644 package/git/0002-configure.ac-Fix-without-iconv.patch
package/git/0001-configure.ac-fix-old-iconv-check.patch new file +42 -0
@@ -0,0 +1,42 @@ +From 3c170355aeba39bb310d8b9192c9623b380d5eae Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <[email protected]> +Date: Mon, 16 Jan 2017 20:14:10 +0100 +Subject: [PATCH 1/2] configure.ac: fix old iconv check + +According to +https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Running-the-Compiler.html +the parameter syntax of AC_COMPILE_IFELSE is + +(input, [action-if-true], [action-if-false]) + +Displaying "no" when the test was positive and enabling support for old +iconv implementations by OLD_ICONV=UnfortunatelyYes when the test fails +it obviously wrong. This patch switches the actions to fix the problem. + +Patch sent upstream: +https://public-inbox.org/git/20170116195638.3713-1-bernd.kuhls at writeme.com/T/#t + +Signed-off-by: Bernd Kuhls <[email protected]> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0b15f04b1..63e71a472 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -759,9 +759,9 @@ GIT_STASH_FLAGS($ICONVDIR) + + AC_MSG_CHECKING([for old iconv()]) + AC_COMPILE_IFELSE([OLDICONVTEST_SRC], +- [AC_MSG_RESULT([no])], + [AC_MSG_RESULT([yes]) +- OLD_ICONV=UnfortunatelyYes]) ++ OLD_ICONV=UnfortunatelyYes], ++ [AC_MSG_RESULT([no])]) + + GIT_UNSTASH_FLAGS($ICONVDIR) + +-- +2.11.0 +
package/git/0002-configure.ac-Fix-without-iconv.patch new file +51 -0
51 lines not on this page · raw message
package/git/git.mk +1 -0
@@ -10,6 +10,7 @@ GIT_SITE = https://www.kernel.org/pub/software/scm/git GIT_LICENSE = GPLv2 LGPLv2.1+ GIT_LICENSE_FILES = COPYING LGPL-2.1 GIT_DEPENDENCIES = zlib host-gettext +GIT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_OPENSSL),y) GIT_DEPENDENCIES += openssl
Signature · 1 line
2.11.0
PATCH 2/2 package/git: remove optional dependency to libiconv
Tested using this minimal defconfig:
BR2_PACKAGE_GIT=y
$ grep BR2_ENABLE_LOCALE= .config $
Signed-off-by Bernd Kuhls <[email protected]>
--- package/git/Config.in | 1 - 1 file changed, 1 deletion(-)
package/git/Config.in +0 -1
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GIT bool "git" depends on BR2_USE_MMU # uses fork() 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.
Signature · 1 line
2.11.0
PATCH 1/2 package/git: Fix build without libiconv
In reply to Bernd KuhlsHello,
Quoted 9 lines · Bernd Kuhls
+++
b/package/git/0001-configure.ac-fix-old-iconv-check.patchpackage/git/0001-configure.ac-fix-old-iconv-check.patch new file +7
-0@@ -0,0 +1,42 @@ +From 3c170355aeba39bb310d8b9192c9623b380d5eae Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <[email protected]> +Date: Mon, 16 Jan 2017 20:14:10 +0100 +Subject: [PATCH 1/2] configure.ac: fix old iconv check + +According to +https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Running-the-Compiler.html
package/git/0001-configure.ac-fix-old-iconv-check.patch line 17
Quoted 10 lines
package/git/0001-configure.ac-fix-old-iconv-check.patch new file +10
-0+the parameter syntax of AC_COMPILE_IFELSE is + +(input, [action-if-true], [action-if-false]) + +Displaying "no" when the test was positive and enabling support for old +iconv implementations by OLD_ICONV=UnfortunatelyYes when the test fails +it obviously wrong. This patch switches the actions to fix the problem. + +Patch sent upstream: +https://public-inbox.org/git/20170116195638.3713-1-bernd.kuhls at writeme.com/T/#t
Seems like the feedback from upstream about this patch was that it wasn't correct. Have you had the chance to look into this?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com