From bd84d517eb95df96d6e9dccac387a135a6cc4065 Mon Sep 17 00:00:00 2001 From: Damien Mascord Date: Mon, 1 Nov 2021 20:06:20 +1100 Subject: 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 Tested-by: Aleksander Jan Bajkowski # Tested on Debian 11 Tested-By: Lucian Cristian Tested-By: Baptiste Jonglez Cc: Rosen Penev (cherry picked from commit 6a5b4228e30244b44a49f523dea66caf3fbe3307) Signed-off-by: Baptiste Jonglez [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(-) (limited to 'include') 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)) -- cgit v1.2.3