From: Alexander Ryzhov <redacted>
Date: Tue, 8 Dec 2015 07:06:51 +0000 (-0500)
Subject: unzip: enable unicode support and avoid packing the same binary twice
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=fc2a2dadb1860e6d15a7e50425e6cab55670f3d0;p=openwrt-packages.git

unzip: enable unicode support and avoid packing the same binary twice

Closes https://github.com/openwrt/packages/pull/2081.

Signed-off-by: Alexander Ryzhov <redacted>
Signed-off-by: Álvaro Fernández Rojas <redacted>
---

diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile
index 112b3f4e8..a0d0d14ab 100644
--- a/utils/unzip/Makefile
+++ b/utils/unzip/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=unzip
 PKG_REV:=60
 PKG_VERSION:=6.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz
 PKG_SOURCE_URL:=@SF/infozip
@@ -44,7 +44,13 @@ endef
 define Build/Configure
 endef
 
-TARGET_CFLAGS += -DNO_LCHMOD -DLARGE_FILE_SUPPORT
+TARGET_CFLAGS += \
+	-DNO_LCHMOD \
+	-DLARGE_FILE_SUPPORT \
+	-DUNICODE_WCHAR \
+	-DUNICODE_SUPPORT \
+	-DUTF8_MAYBE_NATIVE \
+	-DZIP64_SUPPORT
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) -f unix/Makefile unzips \
@@ -59,7 +65,10 @@ endef
 
 define Package/unzip/install
 	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/bin/{funzip,unzip,unzipsfx,zipgrep} \
+		$(1)/usr/bin/
+	$(LN) unzip $(1)/usr/bin/zipinfo
 endef
 
 $(eval $(call BuildPackage,unzip))