Hello community,
here is the log from the commit of package armnn for openSUSE:Factory checked in at 2020-05-29 21:24:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/armnn (Old)
and /work/SRC/openSUSE:Factory/.armnn.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "armnn"
Fri May 29 21:24:14 2020 rev:8 rq:810035 version:20.02
Changes:
--------
--- /work/SRC/openSUSE:Factory/armnn/armnn.changes 2020-04-01 19:13:43.651406646 +0200
+++ /work/SRC/openSUSE:Factory/.armnn.new.3606/armnn.changes 2020-05-29 21:39:06.714959716 +0200
@@ -1,0 +2,7 @@
+Thu May 28 15:10:11 UTC 2020 - Guillaume GARDET
+
+- Apply boost link fixes only for armnn_extra_tests
+- Apply patches for armnn_extra_tests only when
+ armnn_extra_tests is built
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ armnn.spec ++++++
--- /var/tmp/diff_new_pack.bMn9M3/_old 2020-05-29 21:39:07.382961705 +0200
+++ /var/tmp/diff_new_pack.bMn9M3/_new 2020-05-29 21:39:07.382961705 +0200
@@ -107,12 +107,14 @@
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 @@
%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}