aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-11-21 15:13:31 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-11-21 15:13:31 +0400
commite1c0031bc602598c94ca8d840da4f293f28194eb (patch)
treedb307e4ad054050aeba981f481f130e51f66d780
parent5ef82e5fda712d9e577d06c2128163d8089c7065 (diff)
downloadcibs-e1c0031bc602598c94ca8d840da4f293f28194eb.tar.gz
Use GNU patch
-rw-r--r--rules/patch.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/rules/patch.mk b/rules/patch.mk
index 947b982..36dbb66 100644
--- a/rules/patch.mk
+++ b/rules/patch.mk
@@ -24,18 +24,19 @@
# include guard
ifeq (,$(__patch_mk))
+build-depends += gnu-patch
+
patchdir = $(CURDIR)/patches
patches = $(shell [ -d "$(patchdir)" ] && cd "$(patchdir)" && ls -1 | sort)
# Try different path levels:
-applied-%-stamp: $(patchdir)/% unpack-stamp check-build-dep-stamp
+applied-%-stamp: $(patchdir)/% unpack-stamp
cd "$(sourcedir)" && \
- patch -p1 -t < $< || \
- patch -p0 -t < $< || \
- patch -p2 -t < $<
+ gpatch -p1 -t < $< || \
+ gpatch -p0 -t < $< || \
+ gpatch -p2 -t < $<
touch $@
-
patch-stamp: $(patches:%=applied-%-stamp)
pre-configure-stamp: patch-stamp