cryptsetup: fix compilation with full NLS 13518/head
authorRosen Penev <rosenp@gmail.com>
Tue, 29 Sep 2020 03:34:30 +0000 (20:34 -0700)
committerRosen Penev <rosenp@gmail.com>
Tue, 29 Sep 2020 06:11:57 +0000 (23:11 -0700)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
utils/cryptsetup/Makefile

index a87f07d45dbbbc302909a9c93f3f616c23f19210..9c23be72424f16b61d37ef9e985ef685d9e36ae0 100644 (file)
@@ -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