From ac0a66e2884cf5db495c191970ad99b6353d94ec Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 4 Mar 2024 23:45:15 +0100 Subject: [PATCH] build: do not depend on $(STAGING_DIR)/.prepared when in SDK The dependency can't be satisfied when building using the SDK, breaking package builds. As the staging and bin dirs are distributed with the SDK archive, ignoring the dependency is fine when SDK is set. Fixes: fbb924abff8a ("build: add $(STAGING_DIR) and $(BIN_DIR) ...") Signed-off-by: Matthias Schiffer (cherry picked from commit 2b46cbef8179b4a131bd008c520339441bc87c97) --- package/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/Makefile b/package/Makefile index 4663b41de4..d72ce09a81 100644 --- a/package/Makefile +++ b/package/Makefile @@ -59,6 +59,7 @@ $(curdir)/merge-index: $(curdir)/merge (cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; ) ifndef SDK + $(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR) $(curdir)/compile: $(curdir)/system/opkg/host/compile endif @@ -117,8 +118,6 @@ endif $(curdir)/flags-install:= -j1 -$(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR) - $(eval $(call stampfile,$(curdir),package,prereq,.config)) $(eval $(call stampfile,$(curdir),package,cleanup,$(TMP_DIR)/.build)) $(eval $(call stampfile,$(curdir),package,compile,$(TMP_DIR)/.build)) -- 2.25.1