From 4d3ae20f4bbb4dba285d79d3f88c85b48a944199 Mon Sep 17 00:00:00 2001 From: Fabian Deutsch Date: Fri, 25 Apr 2014 16:30:16 +0200 Subject: [PATCH] Pull patching into %pre Signed-off-by: Fabian Deutsch --- arm-nosse2.patch | 6 +++--- opencl-headers.spec | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arm-nosse2.patch b/arm-nosse2.patch index c0adae5..7e557be 100644 --- a/arm-nosse2.patch +++ b/arm-nosse2.patch @@ -1,5 +1,5 @@ ---- cl.hpp 2014-04-25 09:53:03.029286394 +0200 -+++ cl.hpp.mod 2014-04-25 09:55:06.330122827 +0200 +--- cl.hpp.orig 2014-04-25 16:23:05.930403731 +0200 ++++ cl.hpp 2014-04-25 16:26:59.894036540 +0200 @@ -212,8 +212,11 @@ #if defined(linux) || defined(__APPLE__) || defined(__MACOSX) #include @@ -20,7 +20,7 @@ inline void fence() { _mm_mfence(); } +#else + inline void fence() {} -+#endif ++#endif // __SSE2__ + }; // namespace detail diff --git a/opencl-headers.spec b/opencl-headers.spec index c116ccc..a08491c 100644 --- a/opencl-headers.spec +++ b/opencl-headers.spec @@ -1,7 +1,7 @@ Summary: Khronos OpenCL development headers Name: opencl-headers Version: 1.2 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: http://www.khronos.org/registry/cl/ BuildArch: noarch @@ -25,6 +25,10 @@ Khronos OpenCL development headers %prep +%setup -T -c + +cp %{SOURCE9} . +%patch0 -b .nosse2 %build @@ -42,10 +46,9 @@ cp \ %{SOURCE6} \ %{SOURCE7} \ %{SOURCE8} \ - %{SOURCE9} \ + cl.hpp \ $RPM_BUILD_ROOT%{_includedir}/CL/ -patch $RPM_BUILD_ROOT%{_includedir}/CL/cl.hpp %{PATCH0} %files @@ -62,6 +65,9 @@ patch $RPM_BUILD_ROOT%{_includedir}/CL/cl.hpp %{PATCH0} %{_includedir}/CL/cl.hpp %changelog +* Fri Apr 25 2014 Fabian Deutsch - 1.2-5 +- Pull patch application into pre + * Fri Apr 25 2014 Fabian Deutsch - 1.2-4 - Add patch for cl.hpp to be usable on arm rhbz#1027199