From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 25 May 2017 18:38:10 +0000 (+0200)
Subject: build: fix QUILT related overrides
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4b8a7c9b48c4a6cd4c7bdc92dff99cb0b2682d32;p=openwrt%2Fstaging%2Fblogic.git

build: fix QUILT related overrides

They need to be defined before including quilt.mk

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/include/package.mk b/include/package.mk
index 7047b5c83b3e..5dc4aec70da1 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -39,6 +39,18 @@ include $(INCLUDE_DIR)/hardening.mk
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/unpack.mk
 include $(INCLUDE_DIR)/depends.mk
+
+ifneq ($(if $(CONFIG_SRC_TREE_OVERRIDE),$(wildcard ./git-src)),)
+  USE_GIT_TREE:=1
+  QUILT:=1
+endif
+ifdef USE_SOURCE_DIR
+  QUILT:=1
+endif
+ifneq ($(wildcard $(PKG_BUILD_DIR)/.source_dir),)
+  QUILT:=1
+endif
+
 include $(INCLUDE_DIR)/quilt.mk
 
 find_library_dependencies = $(wildcard $(patsubst %,$(STAGING_DIR)/pkginfo/%.version, \
@@ -76,16 +88,6 @@ define CleanStaging
 	)
 endef
 
-ifneq ($(if $(CONFIG_SRC_TREE_OVERRIDE),$(wildcard ./git-src)),)
-  USE_GIT_TREE:=1
-  QUILT:=1
-endif
-ifdef USE_SOURCE_DIR
-  QUILT:=1
-endif
-ifneq ($(wildcard $(PKG_BUILD_DIR)/.source_dir),)
-  QUILT:=1
-endif
 
 PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD_VARIANT),default).install