diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2019-06-12 05:50:36 +0000 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2019-06-15 13:28:43 +0800 |
| commit | b02e4eafd18eb436f0d4ebcc1cf345bb024fc093 (patch) | |
| tree | 1f1cf78a7a9b964f7d023bacd942de367137f281 /devel/diffutils | |
| parent | dfeff9888a430f9530178f6a614166644620de4f (diff) | |
diffutils: provide diff, cmp as alternatives
Resolves openwrt/packages#6361
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'devel/diffutils')
| -rw-r--r-- | devel/diffutils/Makefile | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index 3f93ef67e..65a41f8eb 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=diffutils PKG_VERSION:=3.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/diffutils @@ -30,6 +30,10 @@ define Package/diffutils DEPENDS:=+USE_GLIBC:librt TITLE:=diffutils URL:=http://www.gnu.org/software/diffutils/ + ALTERNATIVES:=\ + 200:/usr/bin/cmp:/usr/bin/gnu-cmp \ + 200:/usr/bin/diff:/usr/bin/gnu-diff \ + endef define Package/diffutils/description @@ -43,23 +47,9 @@ CONFIGURE_VARS += \ define Package/diffutils/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3,diff,cmp} $(1)/usr/bin/ -endef - -define Package/diffutils/preinst -#!/bin/sh -for x in sdiff diff3 diff cmp; do - [ -L "$${IPKG_INSTROOT}/usr/bin/$$x" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/$$x" -done -exit 0 -endef - -define Package/diffutils/postrm -#!/bin/sh -for x in sdiff diff3 diff cmp; do - /bin/busybox $$x -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/$$x -done -exit 0 + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/diff $(1)/usr/bin/gnu-diff + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmp $(1)/usr/bin/gnu-cmp endef $(eval $(call BuildPackage,diffutils)) |