Hello community,
here is the log from the commit of package mvapich2 for openSUSE:Factory checked in at 2019-05-14 13:42:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mvapich2 (Old)
and /work/SRC/openSUSE:Factory/.mvapich2.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mvapich2"
Tue May 14 13:42:34 2019 rev:16 rq:702623 version:2.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/mvapich2/mvapich2.changes 2019-05-02 19:21:43.145832258 +0200
+++ /work/SRC/openSUSE:Factory/.mvapich2.new.5148/mvapich2.changes 2019-05-14 13:43:18.708632993 +0200
@@ -1,0 +2,11 @@
+Mon May 13 07:59:22 UTC 2019 - Nicolas Morey-Chaisemartin
+
+- Update to mvapich2 2.3.1
+ - See CHANGELOG for fixes and new features
+- Refreshed patches against the new version:
+ - 0001-Drop-GCC-check.patch
+ - mvapich2-arm-support.patch
+ - mvapich2-s390_get_cycles.patch
+- Drop mvapich2-fix-double-free.patch as it was merged upstream
+
+-------------------------------------------------------------------
Old:
----
mvapich2-2.2.tar.gz
mvapich2-fix-double-free.patch
New:
----
mvapich2-2.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mvapich2.spec ++++++
--- /var/tmp/diff_new_pack.LiZd38/_old 2019-05-14 13:43:19.280634202 +0200
+++ /var/tmp/diff_new_pack.LiZd38/_new 2019-05-14 13:43:19.284634211 +0200
@@ -19,8 +19,8 @@
%global flavor @BUILD_FLAVOR@%{nil}
%define pname mvapich2
-%define vers 2.2
-%define _vers 2_2
+%define vers 2.3.1
+%define _vers 2_3_1
%if "%{flavor}" == ""
ExclusiveArch: do_not_build
@@ -167,7 +167,6 @@
# PATCH-FIX-UPSTREAM 0001-Drop-GCC-check.patch (bnc#1129421)
# It's been merged upstream, should be removed with the next release
Patch3: 0001-Drop-GCC-check.patch
-Patch4: mvapich2-fix-double-free.patch
Url: http://mvapich.cse.ohio-state.edu/overview/mvapich2/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -298,7 +297,6 @@
%patch0
%patch2
%patch3
-%patch4
cp /usr/share/automake*/config.* .
%build
++++++ 0001-Drop-GCC-check.patch ++++++
--- /var/tmp/diff_new_pack.LiZd38/_old 2019-05-14 13:43:19.304634253 +0200
+++ /var/tmp/diff_new_pack.LiZd38/_new 2019-05-14 13:43:19.304634253 +0200
@@ -1,7 +1,19 @@
-diff -Nrua autogen.sh autogen.sh
+commit b609280fc0d0f0f5a728b08e874977cb16f921b8
+Author: Nicolas Morey-Chaisemartin
+Date: Thu May 2 08:17:42 2019 +0200
+
+ 0001 Drop GCC check
+
+ Skip GCC badly written GCC check intended for older released that may cause
+ bugs during future GCC updates
+
+ Signed-off-by: Nicolas Morey-Chaisemartin
+
+diff --git autogen.sh autogen.sh
+index a0b3d897d15b..f13f3ad543f0 100755
--- autogen.sh
+++ autogen.sh
-@@ -516,7 +516,7 @@
+@@ -516,7 +516,7 @@ fi
echo_n "Checking for automake version... "
recreate_tmp
@@ -10,19 +22,20 @@
cat > .tmp/configure.ac< mvapich2-2.3.1.tar.gz ++++++
/work/SRC/openSUSE:Factory/mvapich2/mvapich2-2.2.tar.gz /work/SRC/openSUSE:Factory/.mvapich2.new.5148/mvapich2-2.3.1.tar.gz differ: char 5, line 1
++++++ mvapich2-arm-support.patch ++++++
--- /var/tmp/diff_new_pack.LiZd38/_old 2019-05-14 13:43:19.360634371 +0200
+++ /var/tmp/diff_new_pack.LiZd38/_new 2019-05-14 13:43:19.364634380 +0200
@@ -1,12 +1,21 @@
+commit 55640b711726705a0127eb7ce767ef69e7642790
+Author: Nicolas Morey-Chaisemartin
+Date: Thu Jun 8 15:14:01 2017 +0200
+
+ mvapich2 arm support
+
+ Signed-off-by: Nicolas Morey-Chaisemartin
+
diff --git src/mpid/ch3/channels/common/include/mv2_clock.h src/mpid/ch3/channels/common/include/mv2_clock.h
-index ac117c2..335d07f 100644
+index af8bb2b77d08..b73a4ffa2fc0 100644
--- src/mpid/ch3/channels/common/include/mv2_clock.h
+++ src/mpid/ch3/channels/common/include/mv2_clock.h
-@@ -81,7 +81,24 @@ static inline cycles_t get_cycles()
- asm volatile ("mov %0=ar.itc" : "=r" (ret));
- return ret;
+@@ -92,7 +92,14 @@ static inline cycles_t get_cycles()
+
+ return ret;
}
-+#elif defined(__ARM_ARCH_7A__) || defined(__arm__)
+-
++#elif defined(__ARM_ARCH_7A__)
+typedef unsigned long long cycles_t;
+static inline cycles_t get_cycles(void)
+{
@@ -14,16 +23,6 @@
+ asm volatile("mrrc p15, 0, %Q0, %R0, c14" : "=r" (clk));
+ return clk;
+}
-+#elif defined(__aarch64__)
-
-+typedef unsigned long cycles_t;
-+static inline cycles_t get_cycles()
-+{
-+ cycles_t cval;
-+ asm volatile("isb" : : : "memory");
-+ asm volatile("mrs %0, cntvct_el0" : "=r" (cval));
-+ return cval;
-+}
#elif defined(__s390__) || defined(__s390x__)
typedef unsigned long cycles_t;
static inline cycles_t get_cycles()
++++++ mvapich2-s390_get_cycles.patch ++++++
--- /var/tmp/diff_new_pack.LiZd38/_old 2019-05-14 13:43:19.372634397 +0200
+++ /var/tmp/diff_new_pack.LiZd38/_new 2019-05-14 13:43:19.376634405 +0200
@@ -1,9 +1,17 @@
+commit 92d5b11beaf8919979705f44d56eb0569feceb93
+Author: Nicolas Morey-Chaisemartin
+Date: Thu Jun 8 15:11:12 2017 +0200
+
+ mvapich2-s390_get_cycles
+
+ Signed-off-by: Nicolas Morey-Chaisemartin
+
diff --git src/mpid/ch3/channels/common/include/mv2_clock.h src/mpid/ch3/channels/common/include/mv2_clock.h
-index 7edc148..ac117c2 100644
+index dba8e51bf129..af8bb2b77d08 100644
--- src/mpid/ch3/channels/common/include/mv2_clock.h
+++ src/mpid/ch3/channels/common/include/mv2_clock.h
-@@ -82,6 +82,14 @@ static inline cycles_t get_cycles()
- return ret;
+@@ -93,6 +93,14 @@ static inline cycles_t get_cycles()
+ return ret;
}
+#elif defined(__s390__) || defined(__s390x__)