From: Rosen Penev <redacted>
Date: Tue, 29 Sep 2020 03:34:30 +0000 (-0700)
Subject: cryptsetup: fix compilation with full NLS
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=87a4eeb8de28caa4a054efc1b8a8c3e5ac11b47d;p=openwrt-packages.git

cryptsetup: fix compilation with full NLS

Signed-off-by: Rosen Penev <redacted>
---

diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile
index a87f07d45..9c23be724 100644
--- a/utils/cryptsetup/Makefile
+++ b/utils/cryptsetup/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cryptsetup
 PKG_VERSION:=2.3.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.3
@@ -30,7 +30,7 @@ define Package/cryptsetup
   CATEGORY:=Utilities
   SUBMENU:=Encryption
   TITLE:=Cryptsetup
-  DEPENDS:=$(ICONV_DEPENDS) +libblkid +libuuid +libpopt +lvm2 +libdevmapper +libjson-c +@KERNEL_DIRECT_IO +kmod-crypto-user
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +libblkid +libuuid +libpopt +lvm2 +libdevmapper +libjson-c +@KERNEL_DIRECT_IO +kmod-crypto-user
   URL:=https://gitlab.com/cryptsetup/cryptsetup/
 endef
 
@@ -49,8 +49,6 @@ CONFIGURE_ARGS += \
 	--with-luks2-lock-path=/var/run/cryptsetup \
 	--with-crypto_backend=kernel
 
-TARGET_LDFLAGS += -liconv
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libcryptsetup.h $(1)/usr/include