It allows more platforms to be able to build it such as Cygwin. This is the same patch currently in the packages repo.
Signed-off-by: Rosen Penev <ros...@gmail.com> --- ..._CHECK_LIB-for-iconv-library-linking.patch | 27 ------------------- tools/dosfstools/patches/010-iconv.patch | 26 ++++++++++++++++++ 2 files changed, 26 insertions(+), 27 deletions(-) delete mode 100644 tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch create mode 100644 tools/dosfstools/patches/010-iconv.patch diff --git a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch b/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch deleted file mode 100644 index ea93320821..0000000000 --- a/tools/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1c6c135ee15e449c1bf2e76d5307f83a3a1d7425 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <nolt...@gmail.com> -Date: Tue, 11 Oct 2016 12:07:48 +0200 -Subject: [PATCH] Switch to AC_CHECK_LIB for iconv library linking. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -AC_SEARCH_LIB doesn't work properly for openwrt/lede when building dosfstools -as a package. - -Signed-off-by: Álvaro Fernández Rojas <nolt...@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -59,7 +59,7 @@ if test "x$with_udev" != "xno"; then - [true]) - fi - --AC_SEARCH_LIBS(iconv_open, iconv) -+AC_CHECK_LIB(iconv, iconv_open) - - # xxd (distributed with vim) is used in the testsuite - AC_CHECK_PROG([XXD_FOUND], [xxd], [yes]) diff --git a/tools/dosfstools/patches/010-iconv.patch b/tools/dosfstools/patches/010-iconv.patch new file mode 100644 index 0000000000..04d402bf3b --- /dev/null +++ b/tools/dosfstools/patches/010-iconv.patch @@ -0,0 +1,26 @@ +From e18bcc65d5772e518c6496b439bad8a986f7e434 Mon Sep 17 00:00:00 2001 +From: Rosen Penev <ros...@gmail.com> +Date: Thu, 20 Jun 2019 15:18:19 -0700 +Subject: [PATCH] configure: Fix iconv check for cross compilation + +AC_CHECK_LIB is more friendly towards cross-compilation. + +Added check for libiconv_open as that can be used when the libc lacks iconv. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 07e8703..1b09964 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,7 +75,8 @@ if test "x$with_udev" != "xno"; then + [true]) + fi + +-AC_SEARCH_LIBS(iconv_open, iconv) ++AC_CHECK_LIB(iconv, iconv_open) ++AC_CHECK_LIB(iconv, libiconv_open) + + # xxd (distributed with vim) is used in the testsuite + AC_CHECK_PROG([XXD_FOUND], [xxd], [yes]) -- 2.17.1 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
