summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-07-25 06:47:52 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-07-25 06:47:52 (GMT)
commitfda212c27372f4da7b46bc65f80fcd8d0ff1e00f (patch)
tree6cc69b81e301c0ce6e0f8d82e01cbf66a8a42ad4 /src
parent6bfb535ef66861ad82e0567af62fc18d2489992c (diff)
downloadmxe-fda212c27372f4da7b46bc65f80fcd8d0ff1e00f.zip
mxe-fda212c27372f4da7b46bc65f80fcd8d0ff1e00f.tar.gz
mxe-fda212c27372f4da7b46bc65f80fcd8d0ff1e00f.tar.bz2
openmp-validation: consolidate patches
Diffstat (limited to 'src')
-rw-r--r--src/openmp-validation-1-fixes.patch21
-rw-r--r--src/openmp-validation-2-perl-cwd-not-in-inc-anymore.patch14
2 files changed, 21 insertions, 14 deletions
diff --git a/src/openmp-validation-1-fixes.patch b/src/openmp-validation-1-fixes.patch
index dfdacb8..84f710c 100644
--- a/src/openmp-validation-1-fixes.patch
+++ b/src/openmp-validation-1-fixes.patch
@@ -101,3 +101,24 @@ index 1111111..2222222
+)
+echo. >> %LOG_FILE%
+echo Total tests: !TEST_COUNT! Total Failed: !FAIL_COUNT! Total Passed: !PASS_COUNT!>> %LOG_FILE%
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Moritz Bunkus <moritz@bunkus.org>
+Date: Tue, 25 Jul 2017 16:46:33 +1000
+Subject: [PATCH] perl cwd not in inc anymore
+
+
+diff --git a/runtest.pl b/runtest.pl
+index 1111111..2222222 100755
+--- a/runtest.pl
++++ b/runtest.pl
+@@ -1,5 +1,9 @@
+ #!/usr/bin/env perl
+
++BEGIN {
++ unshift @INC, '.';
++}
++
+ # runtest [options] FILENAME
+ #
+ # Read the file FILENAME. Each line contains a test.
diff --git a/src/openmp-validation-2-perl-cwd-not-in-inc-anymore.patch b/src/openmp-validation-2-perl-cwd-not-in-inc-anymore.patch
deleted file mode 100644
index f4e6473..0000000
--- a/src/openmp-validation-2-perl-cwd-not-in-inc-anymore.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/runtest.pl b/runtest.pl
-index 3472351..e84595b 100755
---- a/runtest.pl
-+++ b/runtest.pl
-@@ -1,5 +1,9 @@
- #!/usr/bin/env perl
-
-+BEGIN {
-+ unshift @INC, '.';
-+}
-+
- # runtest [options] FILENAME
- #
- # Read the file FILENAME. Each line contains a test.