dosfsutils: Properly fix iconv linking
Necessary when using libiconv.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from fbfe49d7ff
)
This commit is contained in:
parent
f273581e12
commit
02d64a9222
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=dosfstools
|
PKG_NAME:=dosfstools
|
||||||
PKG_VERSION:=4.1
|
PKG_VERSION:=4.1
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=3
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \
|
PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \
|
||||||
|
@ -42,8 +42,6 @@ define Package/dosfstools/description
|
||||||
The dosfstools package includes the mkfs.fat and fsck.fat utilities, which respectively make and check MS-DOS FAT filesystems.
|
The dosfstools package includes the mkfs.fat and fsck.fat utilities, which respectively make and check MS-DOS FAT filesystems.
|
||||||
endef
|
endef
|
||||||
|
|
||||||
TARGET_LDFLAGS += $(if $(ICONV_FULL),-liconv)
|
|
||||||
|
|
||||||
define Package/dosfstools/install
|
define Package/dosfstools/install
|
||||||
$(INSTALL_DIR) $(1)/usr/sbin
|
$(INSTALL_DIR) $(1)/usr/sbin
|
||||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fatlabel $(1)/usr/sbin/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fatlabel $(1)/usr/sbin/
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
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])
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
From e18bcc65d5772e518c6496b439bad8a986f7e434 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Rosen Penev <rosenp@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])
|
Loading…
Reference in New Issue