From: Matthias Schiffer <redacted>
Date: Mon, 3 Oct 2016 12:03:45 +0000 (+0200)
Subject: libtool-bin: don't rely on STAGING_DIR_HOST
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=bc65f629d6510b0697b761fe1403cd3466e48087;p=openwrt-packages.git

libtool-bin: don't rely on STAGING_DIR_HOST

We can just set GREP and SED in the configure command instead of fixing up
the paths using sed afterwards. This makes the build more robust (and we're
currently preparing a change of the host staging dirs in LEDE that might
break this otherwise).

Signed-off-by: Matthias Schiffer <redacted>
---

diff --git a/devel/libtool-bin/Makefile b/devel/libtool-bin/Makefile
index e7922c33e..4ed689c81 100644
--- a/devel/libtool-bin/Makefile
+++ b/devel/libtool-bin/Makefile
@@ -22,6 +22,8 @@ PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+CONFIGURE_VARS += GREP=grep SED=sed
+
 define Package/libtool-bin
   SECTION:=devel
   CATEGORY:=Development
@@ -39,7 +41,6 @@ endef
 define Package/libtool-bin/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(1)/usr/bin/
-	$(SED) 's|$(STAGING_DIR_HOST)||g' $(1)/usr/bin/libtoolize
 	$(INSTALL_DIR) $(1)/usr/share/aclocal/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4 \
 	  $(1)/usr/share/aclocal/