From: Daniel Golle <daniel@makrotopia.org>
Date: Mon, 1 Mar 2021 14:06:33 +0000 (+0000)
Subject: tools: xxd: use more convenient source tarball
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2b94aac7a128;p=openwrt%2Fstaging%2Fnbd.git

tools: xxd: use more convenient source tarball

Don't download all of vim just to build xxd. Use a tight tarball
containing only xxd sources instead.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/tools/xxd/Makefile b/tools/xxd/Makefile
index 7c225baa00..73a8371a6c 100644
--- a/tools/xxd/Makefile
+++ b/tools/xxd/Makefile
@@ -3,31 +3,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xxd
-PKG_SOURCE_NAME:=vim
-PKG_VERSION:=8.2
-PKG_RELEASE:=2
-VIMVER:=82
-
-PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ftp.vim.org/pub/vim/unix
-PKG_HASH:=f087f821831b4fece16a0461d574ccd55a8279f64d635510a1e10225966ced3b
+PKG_VERSION:=1.10
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://grail.cba.csuohio.edu/~somos/xxd-1.10.tar.gz
+PKG_HASH:=9bf05c19b9084973e3cc877696a7f9881a5c87fa5a9fa438d9962519726559f9
 PKG_CPE_ID:=cpe:/a:vim:vim
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_NAME)$(VIMVER)
-HOST_BUILD_PARALLEL:=1
-
 include $(INCLUDE_DIR)/host-build.mk
 
-define Host/Configure
-endef
-
-define Host/Compile
-	$(HOST_MAKE_VARS) $(MAKE) -C $(HOST_BUILD_DIR)/src/xxd
-endef
-
 define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
-	$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/xxd/xxd $(STAGING_DIR_HOST)/bin/
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/xxd $(STAGING_DIR_HOST)/bin/
 endef
 
 $(eval $(call HostBuild))