From 10378a242f868317b4e13aa4a2a489467ee3f5f0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 1 Jun 2022 19:38:48 +0200 Subject: [PATCH] - buildsystem-helpers: allow patches/$(version) dir --- make/buildsystem-helpers.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/make/buildsystem-helpers.mk b/make/buildsystem-helpers.mk index 2e6f0fd4..8e2ebe08 100644 --- a/make/buildsystem-helpers.mk +++ b/make/buildsystem-helpers.mk @@ -120,7 +120,11 @@ define APPLY_PATCHES # (patches or directory) continue; \ fi; \ if [ -d $$i ]; then \ - for p in $(addprefix $$i/,$(PATCHES)); do \ + v=; \ + if [ -d $$i/$($(PKG)_VERSION) ]; then \ + v="$($(PKG)_VERSION)/"; \ + fi; \ + for p in $(addprefix $$i/$$v,$(PATCHES)); do \ if [ -e $$p ]; then \ $(call MESSAGE,"Applying $${p#$(PKG_PATCHES_DIR)/} (*)"); \ patch -p1 -i $$p; \