From 407cb64794b800465910f66278b8631b9726efd9 Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann+opensusegit@suse.de>
Date: May 29 2020 19:48:17 +0000
Subject: Update armnn to rev 8 via SR 810035
https://build.opensuse.org/request/show/810035
by user Guillaume_G + maxlin_factory
- Apply boost link fixes only for armnn_extra_tests
- Apply patches for armnn_extra_tests only when
armnn_extra_tests is built
---
diff --git a/armnn.changes b/armnn.changes
index c18333d..cce9e3a 100644
--- a/armnn.changes
+++ b/armnn.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu May 28 15:10:11 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Apply boost link fixes only for armnn_extra_tests
+- Apply patches for armnn_extra_tests only when
+ armnn_extra_tests is built
+
+-------------------------------------------------------------------
Tue Mar 31 15:23:29 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Disable RPATH to fix build on Leap15.2/SLE15SP2
diff --git a/armnn.spec b/armnn.spec
index 7014c02..bd43a3d 100644
--- a/armnn.spec
+++ b/armnn.spec
@@ -107,12 +107,14 @@ ExcludeArch: %ix86
BuildRequires: boost-devel >= 1.59
%else
BuildRequires: libboost_filesystem-devel >= 1.59
-BuildRequires: libboost_log-devel >= 1.59
BuildRequires: libboost_program_options-devel >= 1.59
BuildRequires: libboost_system-devel >= 1.59
BuildRequires: libboost_test-devel >= 1.59
+%if %{with armnn_extra_tests}
+BuildRequires: libboost_log-devel >= 1.59
BuildRequires: libboost_thread-devel >= 1.59
%endif
+%endif
%if %{with armnn_caffe}
BuildRequires: caffe-devel
%endif
@@ -357,14 +359,16 @@ This package contains the libarmnnOnnxParser library from armnn.
%prep
%setup -q -n armnn-%{version}
%patch1 -p1
+%if %{with armnn_extra_tests}
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1
%patch204 -p1
%patch205 -p1
-# Boost fixes for dynamic linking
-sed -i 's/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework system filesystem program_options)/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework system filesystem log thread program_options)/' ./cmake/GlobalConfig.cmake
+# Add Boost log as downstream extra test requires it
+sed -i 's/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework system filesystem program_options)/find_package(Boost 1.59 REQUIRED COMPONENTS unit_test_framework system filesystem log program_options)/' ./cmake/GlobalConfig.cmake
+%endif
%build
%if %{with armnn_onnx}