From: Hans Dedecker <dedeckeh@gmail.com>
Date: Sat, 18 Apr 2020 08:34:10 +0000 (+0200)
Subject: binutils: add ALTERNATIVES for strings (FS#3001)
X-Git-Tag: v19.07.3~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=55312cc2025035cc1361417eecfacb4dae46bb67;p=oweals%2Fopenwrt.git

binutils: add ALTERNATIVES for strings (FS#3001)

Don't move strings anymore to /bin/strings to avoid clash with
busybox /usr/bin/strings but move it to /usr/bin/binutils-strings.
Use ALTERNATIVES support to install it as /usr/bin/strings

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 5f126c541a743e2ff5d8f406128d477ab5a509b4)
---

diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile
index 291f45205a..e04611f5d3 100644
--- a/package/devel/binutils/Makefile
+++ b/package/devel/binutils/Makefile
@@ -49,6 +49,7 @@ define Package/binutils
   CATEGORY:=Development
   TITLE:=binutils
   DEPENDS:=+objdump +ar
+  ALTERNATIVES:=200:/usr/bin/strings:/usr/bin/binutils-strings
 endef
 
 define Package/objdump
@@ -114,7 +115,7 @@ endef
 define Package/binutils/install
 	$(INSTALL_DIR) $(1)/usr $(1)/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/
-	mv $(1)/usr/bin/strings $(1)/bin/strings
+	mv $(1)/usr/bin/strings $(1)/usr/bin/binutils-strings
 	rm -f $(1)/usr/bin/objdump
 	rm -f $(1)/usr/bin/ar
 endef