[openwrt/openwrt] build: fix ldconfig executable error in python

LEDE Commits lede-commits at lists.infradead.org
Mon Jul 4 01:11:29 PDT 2022


zorun pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/bd84d517eb95df96d6e9dccac387a135a6cc4065

commit bd84d517eb95df96d6e9dccac387a135a6cc4065
Author: Damien Mascord <tusker at tusker.org>
AuthorDate: Mon Nov 1 20:06:20 2021 +1100

    build: fix ldconfig executable error in python
    
    The empty executable is causing problems with meson builds, due to the
    error: OSError: [Errno 8] Exec format error: 'ldconfig'
    
    This patch changes the empty ldconfig stub to symlink to /bin/true to
    work around this issue.
    
    Fixes: FS#4117
    Fixes: 3bd31cc4d2ff ("tools/meson: update to 0.60.0")
    
    Signed-off-by: Damien Mascord <tusker at tusker.org>
    Tested-by: Aleksander Jan Bajkowski <olek2 at wp.pl> # Tested on Debian 11
    Tested-By: Lucian Cristian <lucian.cristian at gmail.com>
    Tested-By: Baptiste Jonglez <git at bitsofnetworks.org>
    Cc: Rosen Penev <rosenp at gmail.com>
    (cherry picked from commit 6a5b4228e30244b44a49f523dea66caf3fbe3307)
    Signed-off-by: Baptiste Jonglez <git at bitsofnetworks.org>
    [backport to fix prereq check when moving from 22.03 branch to 21.02]
---
 include/prereq-build.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index d28432f726..d3593b0205 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -196,5 +196,4 @@ prereq: $(STAGING_DIR_HOST)/bin/mkhash
 
 # Install ldconfig stub
 $(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \
-	touch $(STAGING_DIR_HOST)/bin/ldconfig && \
-	chmod +x $(STAGING_DIR_HOST)/bin/ldconfig))
+	$(LN) /bin/true $(STAGING_DIR_HOST)/bin/ldconfig))




More information about the lede-commits mailing list