From f8cfd424be547ed033da22cee468014435d3c580 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Thu, 2 Aug 2012 22:17:38 +0000 Subject: [PATCH] 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 --- make/include/contrib.defs | 4 ++-- 1 file 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 -- 2.40.0