--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/erlang/patches/test-ordering.patch	Mon May 11 05:48:43 2015 -0700
@@ -0,0 +1,29 @@
+Fix erlang tests so that they are always done in the same order and
+therefore generate test results that we can successfully compare
+against a master test results file.
+
+GNU make v3.82 introduced a change that caused this failure:
+
+  https://lists.gnu.org/archive/html/info-gnu/2010-07/msg00023.html
+
+  * WARNING: Future backward-incompatibility!
+    Wildcards are not documented as returning sorted values, but up to and
+    including this release the results have been sorted and some makefiles are
+    apparently depending on that.  In the next release of GNU make, for
+    performance reasons, we may remove that sorting.  If your makefiles
+    require sorted results from wildcard expansions, use the $(sort ...)
+    function to request it explicitly.
+ 
+This change will be passed upstream.
+
+--- otp_src_17.5/Makefile.in.orig	2015-04-01 17:11:52.717727683 -0700
++++ otp_src_17.5/Makefile.in	2015-04-01 17:12:23.417905229 -0700
+@@ -987,7 +987,7 @@
+ 
+ TEST_DIRS := \
+ 	lib/test_server \
+-	$(wildcard lib/*/test) \
++	$(sort $(wildcard lib/*/test)) \
+ 	erts/test \
+ 	erts/epmd/test \
+ 	erts/emulator/test