summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2012-08-02 22:17:38 +0000
committerjstebbins <[email protected]>2012-08-02 22:17:38 +0000
commitf8cfd424be547ed033da22cee468014435d3c580 (patch)
tree18e6c9bd779616413078a0ff3c6ea250782ade52 /make
parentb3717d369763d620d548f224daeba5a7503fa972 (diff)
build system: enforce an order to applying contrib patches
New patch for a52dec has a dependency on another patch and must be applied after it. Patches appeared to be getting applied in whatever order the filesystem presented the files in. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4886 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
-rw-r--r--make/include/contrib.defs4
1 files changed, 2 insertions, 2 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 1a1d05c71..9dfddea6e 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -46,9 +46,9 @@ define import.CONTRIB.defs
##
## target: patch
##
- $(1).PATCH.srcs = $$(wildcard \
+ $(1).PATCH.srcs = $$(sort $$(wildcard \
$$($(1).src/)A??-*.patch \
- $$($(1).src/)P??-$$(BUILD.system)*.patch )
+ $$($(1).src/)P??-$$(BUILD.system)*.patch ))
# extra line feed is required
define $(1).PATCH.item