diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-05-25 20:38:10 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-05-25 20:42:45 +0200 |
| commit | 4b8a7c9b48c4a6cd4c7bdc92dff99cb0b2682d32 (patch) | |
| tree | a8c167b219794984a35a7c1e12c757be7e850ff9 | |
| parent | c2dc7321d7fdcc7d86a3b284c04bb77f75d5a048 (diff) | |
| download | upstream-4b8a7c9b48c4a6cd4c7bdc92dff99cb0b2682d32.tar.gz upstream-4b8a7c9b48c4a6cd4c7bdc92dff99cb0b2682d32.tar.bz2 upstream-4b8a7c9b48c4a6cd4c7bdc92dff99cb0b2682d32.zip | |
build: fix QUILT related overrides
They need to be defined before including quilt.mk
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | include/package.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/include/package.mk b/include/package.mk index 7047b5c83b..5dc4aec70d 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 |