From f8f2601f53637bdb4050acbcd7751a47bc2aa10e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 28 Apr 2019 13:49:34 -0600
Subject: [PATCH] Update to 3.1.4

---
 .gitignore                                    |  1 +
 ...6e208c5771e0897bcf27430a3afa171ba4c2.patch | 43 -------------------
 openmpi.spec                                  |  7 ++-
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 44a66e208c5771e0897bcf27430a3afa171ba4c2.patch

diff --git a/.gitignore b/.gitignore
index a0fbeb3..50d993d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ openmpi-1.4.1-RH.tar.bz2
 /openmpi-2.1.6rc1.tar.bz2
 /openmpi-2.1.6.tar.bz2
 /openmpi-3.1.3.tar.bz2
+/openmpi-3.1.4.tar.bz2
diff --git a/44a66e208c5771e0897bcf27430a3afa171ba4c2.patch b/44a66e208c5771e0897bcf27430a3afa171ba4c2.patch
deleted file mode 100644
index bb256aa..0000000
--- a/44a66e208c5771e0897bcf27430a3afa171ba4c2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 44a66e208c5771e0897bcf27430a3afa171ba4c2 Mon Sep 17 00:00:00 2001
-From: Gilles Gouaillardet <gilles@rist.or.jp>
-Date: Wed, 7 Sep 2016 08:49:20 +0900
-Subject: [PATCH] threads: fix WAIT_SYNC_INIT with a zero count
-
-WAIT_SYNC_INIT(sync,0); WAIT_SYNC_RELEASE(sync);
-hanged because sync->signaled was initialised to true, and
-there is no reason to invoke WAIT_SYNC_SIGNALED(sync) before
-WAIT_SYNC_RELEASE(sync)
-this commit initializes sync->signaled to true unless the count is zero.
-
-Thanks George for the review and guidance.
----
- opal/threads/wait_sync.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/opal/threads/wait_sync.h b/opal/threads/wait_sync.h
-index 9ebb4d7..2ec8485 100644
---- a/opal/threads/wait_sync.h
-+++ b/opal/threads/wait_sync.h
-@@ -6,6 +6,8 @@
-  * Copyright (c) 2016      Los Alamos National Security, LLC. All rights
-  *                         reserved.
-  * Copyright (c) 2016      Mellanox Technologies. All rights reserved.
-+ * Copyright (c) 2016      Research Organization for Information Science
-+ *                         and Technology (RIST). All rights reserved.
-  * $COPYRIGHT$
-  *
-  * Additional copyrights may follow
-@@ -86,11 +88,11 @@ static inline int sync_wait_st (ompi_wait_sync_t *sync)
- 
- #define WAIT_SYNC_INIT(sync,c)                                  \
-     do {                                                        \
--        (sync)->count = c;                                      \
-+        (sync)->count = (c);                                    \
-         (sync)->next = NULL;                                    \
-         (sync)->prev = NULL;                                    \
-         (sync)->status = 0;                                     \
--        (sync)->signaling = true;                               \
-+        (sync)->signaling = (0 != (c));                         \
-         if (opal_using_threads()) {                             \
-             pthread_cond_init (&(sync)->condition, NULL);       \
-             pthread_mutex_init (&(sync)->lock, NULL);           \
diff --git a/openmpi.spec b/openmpi.spec
index 034be1d..5fa9d4d 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -20,8 +20,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:			openmpi%{?_cc_name_suffix}
-Version:		3.1.3
-Release:		5%{?dist}
+Version:		3.1.4
+Release:		1%{?dist}
 Summary:		Open Message Passing Interface
 License:		BSD and MIT and Romio
 URL:			http://www.open-mpi.org/
@@ -320,6 +320,9 @@ make check
 
 
 %changelog
+* Sun Apr 28 2019 Orion Poplawski <orion@nwra.com> - 3.1.4-1
+- Update to 3.1.4
+
 * Mon Apr 22 2019 Björn Esser <besser82@fedoraproject.org> - 3.1.3-5
 - rebuilt(opensm)
 
diff --git a/sources b/sources
index edcaaa5..3074f9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openmpi-3.1.3.tar.bz2) = 700821df676de5f85ce2793298242dcaea73f585f89540e30999792a568f193545a9f9b2bcb3ea22effa3bf14744531c4eb5fc4c84a8d7bbe5e5fdd76ab3a04a
+SHA512 (openmpi-3.1.4.tar.bz2) = 5b4aafffc79fd85cb94a11a6e2fac563b142ac532191009eb35826c432ed3c391a6616e2ca92eacbf36137468eadb7c0f7ddc787034bc95c4214232ed5128338