From 17c39bec109bce926b1a638094a4a32e1b1c6039 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Nov 13 2018 12:21:51 +0000
Subject: Revert "drop gromacs-issue-2366.patch"


This reverts commit 17e84349eef773b9ca61b92b6d230167fb1beae0.

---

diff --git a/gromacs-issue-2366.patch b/gromacs-issue-2366.patch
new file mode 100644
index 0000000..7c08010
--- /dev/null
+++ b/gromacs-issue-2366.patch
@@ -0,0 +1,19 @@
+diff --git a/src/gromacs/hardware/tests/hardwaretopology.cpp b/src/gromacs/hardware/tests/hardwaretopology.cpp
+index ed7897b01..c31d4b9cd 100644
+--- a/src/gromacs/hardware/tests/hardwaretopology.cpp
++++ b/src/gromacs/hardware/tests/hardwaretopology.cpp
+@@ -185,12 +185,14 @@ TEST(HardwareTopologyTest, NumaCacheSelfconsistency)
+             }
+         }
+ 
++#ifndef __aarch64__
+         // Check cache. The hwloc cache detection is fragile and can report
+         // 0 for line size or associativity (=unknown), so we just check the size.
+         for (auto &c : hwTop.machine().caches)
+         {
+             EXPECT_GT(c.size, 0);
+         }
++#endif
+     }
+ }
+ 
diff --git a/gromacs.spec b/gromacs.spec
index cdaec06..e727a00 100644
--- a/gromacs.spec
+++ b/gromacs.spec
@@ -52,6 +52,9 @@ Patch0:		gromacs-dssp-path.patch
 # add support for lmfit-7.0, can be dropped in gromacs-2019
 # https://redmine.gromacs.org/issues/2533
 Patch1:		facb927.diff
+# enable some test on aarch64 - https://redmine.gromacs.org/issues/2366
+# bug#1558206
+Patch2:		gromacs-issue-2366.patch
 BuildRequires:	gcc-c++
 BuildRequires:  cmake3 >= 3.4.3
 BuildRequires:	openblas-devel
@@ -233,6 +236,9 @@ This package single and double precision binaries and libraries.
 %setup -q %{?SOURCE2:-a 2} -n gromacs-%{version}%{?_rc}
 %patch0 -p1
 %patch1 -p1
+%if 0%{?fedora} <= 29
+%patch2 -p1
+%endif
 install -Dpm644 %{SOURCE1} ./serial/docs/manual/gromacs.pdf
 # Delete bundled stuff so that it doesn't get used accidentally
 # Don't remove tinyxml2 as gromacs needs an old version to build
@@ -380,6 +386,7 @@ done
 %changelog
 * Mon Nov 12 2018 Christoph Junghans <junghans@votca.org> - 2018.4-1
 - Version bump to 2018.4
+- Re-added gromacs-issue-2366.patch for f28 and lower
 
 * Thu Nov 8 2018 Christoph Junghans <junghans@votca.org> - 2018.3-2
 - Enable OpenCL for some archs on epel7