[openwrt/openwrt] rules.mk: simplify FAKEROOT command line

LEDE Commits lede-commits at lists.infradead.org
Thu Oct 29 20:40:50 EDT 2020


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0fdbd2e61f742d9fbd6263bd86da3013ebcb1b9c

commit 0fdbd2e61f742d9fbd6263bd86da3013ebcb1b9c
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Thu Sep 10 14:54:49 2020 +0200

    rules.mk: simplify FAKEROOT command line
    
    Since fakeroot is patched to discover related ressources relative to the
    STAGING_DIR_HOST environment variable, there is no need to pass the path
    to faked or the preload library manually anymore.
    
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 rules.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules.mk b/rules.mk
index 8b2424f2ba..3214395e1f 100644
--- a/rules.mk
+++ b/rules.mk
@@ -264,12 +264,7 @@ endif
 
 BUILD_KEY=$(TOPDIR)/key-build
 
-ifeq ($(HOST_OS),Darwin)
-  FAKEROOT_SO:=$(STAGING_DIR_HOST)/lib/libfakeroot.dylib
-else
-  FAKEROOT_SO:=$(STAGING_DIR_HOST)/lib/libfakeroot.so
-endif
-FAKEROOT:=$(STAGING_DIR_HOST)/bin/fakeroot -l $(FAKEROOT_SO) -f $(STAGING_DIR_HOST)/bin/faked
+FAKEROOT:=$(STAGING_DIR_HOST)/bin/fakeroot
 
 TARGET_CC:=$(TARGET_CROSS)gcc
 TARGET_CXX:=$(TARGET_CROSS)g++



More information about the lede-commits mailing list