Browse Source

- dosfstools: add patch to fix iconv library linking

master
vanhofen 5 years ago
parent
commit
acabe7cc69
  1. 3
      make/target-tools.mk
  2. 27
      patches/dosfstools/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch

3
make/target-tools.mk

@ -1320,12 +1320,15 @@ DOSFSTOOLS_URL = https://github.com/dosfstools/dosfstools/releases/download/v
$(ARCHIVE)/$(DOSFSTOOLS_SOURCE):
$(DOWNLOAD) $(DOSFSTOOLS_URL)/$(DOSFSTOOLS_SOURCE)
DOSFSTOOLS_PATCH = switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch
DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
dosfstools: $(ARCHIVE)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(DOSFSTOOLS_TMP)
$(UNTAR)/$(DOSFSTOOLS_SOURCE)
$(CHDIR)/$(DOSFSTOOLS_TMP); \
$(call apply_patches, $(addprefix $(@F)/,$(DOSFSTOOLS_PATCH))); \
autoreconf -fi; \
$(CONFIGURE) \
--prefix= \

27
patches/dosfstools/switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch

@ -0,0 +1,27 @@
From 1c6c135ee15e449c1bf2e76d5307f83a3a1d7425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@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 <noltari@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])
Loading…
Cancel
Save