diff options
| author | Christoph Junghans <junghans@votca.org> | 2016-11-01 14:52:13 -0600 |
|---|---|---|
| committer | Christoph Junghans <junghans@votca.org> | 2016-11-01 14:52:13 -0600 |
| commit | 9281be027d0630853c6943fd84813f782d6a144e (patch) | |
| tree | 915aa8bf45d8f0e64bb683da27998d36cf405887 | |
| parent | b27702aa286578f02a6de383be7b9959b547445f (diff) | |
| download | fedora-review-9281be027d0630853c6943fd84813f782d6a144e.tar.gz fedora-review-9281be027d0630853c6943fd84813f782d6a144e.tar.xz fedora-review-9281be027d0630853c6943fd84813f782d6a144e.zip | |
legion: fix build on arm
| -rw-r--r-- | legion/204.patch | 53 | ||||
| -rw-r--r-- | legion/legion.spec | 6 |
2 files changed, 56 insertions, 3 deletions
diff --git a/legion/204.patch b/legion/204.patch new file mode 100644 index 0000000..abccdd7 --- /dev/null +++ b/legion/204.patch @@ -0,0 +1,53 @@ +From fad9ef2156d2c7e734e9b291b8c61bd7c7cc79f4 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans <junghans@lanl.gov> +Date: Tue, 1 Nov 2016 14:44:03 -0600 +Subject: [PATCH] fix build on arm (fixes #202) + +--- + examples/circuit/circuit_cpu.cc | 2 ++ + runtime/legion/legion_utilities.h | 2 ++ + runtime/lowlevel_dma.cc | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/examples/circuit/circuit_cpu.cc b/examples/circuit/circuit_cpu.cc +index 78eaf4c..339c55c 100644 +--- a/examples/circuit/circuit_cpu.cc ++++ b/examples/circuit/circuit_cpu.cc +@@ -15,7 +15,9 @@ + + + #include "circuit.h" ++#if defined(__i386__) || defined(__x86_64__) + #include <x86intrin.h> ++#endif + #include <cmath> + + using namespace LegionRuntime::Accessor; +diff --git a/runtime/legion/legion_utilities.h b/runtime/legion/legion_utilities.h +index f7703cf..0db3552 100644 +--- a/runtime/legion/legion_utilities.h ++++ b/runtime/legion/legion_utilities.h +@@ -28,7 +28,9 @@ + + // Apple can go screw itself + #ifndef __MACH__ ++#if defined(__i386__) || defined(__x86_64__) + #include <x86intrin.h> ++#endif + #else + #ifdef __SSE2__ + #include <emmintrin.h> +diff --git a/runtime/lowlevel_dma.cc b/runtime/lowlevel_dma.cc +index 72eb6e4..6463c6c 100644 +--- a/runtime/lowlevel_dma.cc ++++ b/runtime/lowlevel_dma.cc +@@ -40,7 +40,9 @@ + + using namespace LegionRuntime::Accessor; + ++#ifndef __GNUC__ + #include "atomics.h" ++#endif + + #include "realm/timers.h" + #include "realm/serialize.h" diff --git a/legion/legion.spec b/legion/legion.spec index 13db532..0d9bbcc 100644 --- a/legion/legion.spec +++ b/legion/legion.spec @@ -5,9 +5,8 @@ Summary: A data-centric parallel programming system License: ASL 2.0 Url: http://legion.stanford.edu/ Source0: https://github.com/StanfordLegion/legion/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz - -#https://github.com/StanfordLegion/legion/issues/202 -ExcludeArch: aarch64 armv7hl +# PATCH-FIX-UPSTREAM - 204.patch - fix build on arm +Patch0: https://patch-diff.githubusercontent.com/raw/StanfordLegion/legion/pull/204.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -49,6 +48,7 @@ This package contains development headers and libraries for the legion library %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 %build mkdir %{_target_platform} |