Skip to content
Snippets Groups Projects
Unverified Commit 593dac90 authored by Gaëtan Harter's avatar Gaëtan Harter
Browse files

pkg/pkg.mk: add GITAMFLAGS variable

parent 4e872e61
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
pkg/pkg.mk
+ 3
− 1
View file @ 593dac90
...@@ -19,10 +19,12 @@ else ...@@ -19,10 +19,12 @@ else
git-download: $(PKG_BUILDDIR)/.git-downloaded git-download: $(PKG_BUILDDIR)/.git-downloaded
endif endif
GITAMFLAGS = --ignore-whitespace
ifneq (,$(wildcard $(PKG_DIR)/patches)) ifneq (,$(wildcard $(PKG_DIR)/patches))
$(PKG_BUILDDIR)/.git-patched: $(PKG_BUILDDIR)/.git-downloaded $(PKG_DIR)/Makefile $(PKG_DIR)/patches/*.patch $(PKG_BUILDDIR)/.git-patched: $(PKG_BUILDDIR)/.git-downloaded $(PKG_DIR)/Makefile $(PKG_DIR)/patches/*.patch
git -C $(PKG_BUILDDIR) checkout -f $(PKG_VERSION) git -C $(PKG_BUILDDIR) checkout -f $(PKG_VERSION)
git -C $(PKG_BUILDDIR) am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch git -C $(PKG_BUILDDIR) am $(GITAMFLAGS) "$(PKG_DIR)"/patches/*.patch
touch $@ touch $@
endif endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment